diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 12:44:50 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 12:44:50 +0000 |
| commit | 2dbf6c59a2f5d99d3dc8ea3d2ffa409ef2eb611a (patch) | |
| tree | c021a26288d3d501a3dbb8de190cdc6a8e40ffa1 /epan/dissectors/packet-mpeg-audio.c | |
| parent | 875040ec1e304110b2a7f1a6e9ead855d3be2e6f (diff) | |
Remove check_col() from ASN.1 dissectors
svn path=/trunk/; revision=49927
Diffstat (limited to 'epan/dissectors/packet-mpeg-audio.c')
| -rw-r--r-- | epan/dissectors/packet-mpeg-audio.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index a1d3f029b6..29d2ee3418 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -484,16 +484,12 @@ dissect_mpeg_audio_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Audio Layer %d", mpa_layer(&mpa) + 1); if (MPA_BITRATE_VALID(&mpa) && MPA_FREQUENCY_VALID(&mpa)) { data_size = (int)(MPA_DATA_BYTES(&mpa) - sizeof mpa); - if (check_col(pinfo->cinfo, COL_DEF_SRC)) { - SET_ADDRESS(&pinfo->src, AT_NONE, 0, NULL); - col_add_fstr(pinfo->cinfo, COL_DEF_SRC, + SET_ADDRESS(&pinfo->src, AT_NONE, 0, NULL); + col_add_fstr(pinfo->cinfo, COL_DEF_SRC, "%d kb/s", mpa_bitrate(&mpa) / 1000); - } - if (check_col(pinfo->cinfo, COL_DEF_DST)) { - SET_ADDRESS(&pinfo->dst, AT_NONE, 0, NULL); - col_add_fstr(pinfo->cinfo, COL_DEF_DST, + SET_ADDRESS(&pinfo->dst, AT_NONE, 0, NULL); + col_add_fstr(pinfo->cinfo, COL_DEF_DST, "%g kHz", mpa_frequency(&mpa) / (float)1000); - } } if (tree == NULL) @@ -657,7 +653,7 @@ proto_register_mpeg_audio(void) NULL, HFILL }}, /*--- End of included file: packet-mpeg-audio-hfarr.c ---*/ -#line 156 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 152 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" { &hf_mpeg_audio_data, { "Data", "mpeg-audio.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -681,7 +677,7 @@ proto_register_mpeg_audio(void) &ett_mpeg_audio_ID3v1, /*--- End of included file: packet-mpeg-audio-ettarr.c ---*/ -#line 173 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" +#line 169 "../../asn1/mpeg-audio/packet-mpeg-audio-template.c" }; proto_mpeg_audio = proto_register_protocol( |