diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-12-10 00:26:21 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-12-10 00:26:21 +0000 |
| commit | 23319ff023bcb144347a1307b958359b5226c699 (patch) | |
| tree | b347f1669210e07039ec31051cbb2c5e82422e6b /packet-mpeg1.c | |
| parent | a81a607ed5e3d291940ab75dd82d28d72c222b48 (diff) | |
Move the pointer to the "column_info" structure in the "frame_data"
structure to the "packet_info" structure; only stuff that's permanently
stored with each frame should be in the "frame_data" structure, and the
"column_info" structure is not guaranteed to hold the column values for
that frame at all times - it was only in the "frame_data" structure so
that it could be passed to dissectors, and, as all dissectors are now
passed a pointer to a "packet_info" structure, it could just as well be
put in the "packet_info" structure.
That saves memory, by shrinking the "frame_data" structure (there's one
of those per frame), and also lets us clean up the code a bit.
svn path=/trunk/; revision=4370
Diffstat (limited to 'packet-mpeg1.c')
| -rw-r--r-- | packet-mpeg1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-mpeg1.c b/packet-mpeg1.c index 3aaf8eabd1..6f6bedc561 100644 --- a/packet-mpeg1.c +++ b/packet-mpeg1.c @@ -2,7 +2,7 @@ * * Routines for RFC 2250 MPEG-1 dissection * - * $Id: packet-mpeg1.c,v 1.3 2001/07/16 05:16:57 guy Exp $ + * $Id: packet-mpeg1.c,v 1.4 2001/12/10 00:25:30 guy Exp $ * * Copyright 2001, * Francisco Javier Cabello Torres, <fjcabello@vtools.es> @@ -133,14 +133,14 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) guint16 mpg_ffv; guint16 mpg_ffc; - if ( check_col( pinfo->fd, COL_PROTOCOL ) ) + if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { - col_set_str( pinfo->fd, COL_PROTOCOL, "MPEG-1" ); + col_set_str( pinfo->cinfo, COL_PROTOCOL, "MPEG-1" ); } - if ( check_col( pinfo->fd, COL_INFO) ) + if ( check_col( pinfo->cinfo, COL_INFO) ) { - col_set_str( pinfo->fd, COL_INFO, "MPEG-1 message"); + col_set_str( pinfo->cinfo, COL_INFO, "MPEG-1 message"); } /* Get MPEG-1 fields */ |