diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-02-08 23:48:39 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-02-09 05:15:47 +0000 |
| commit | 6ba585c070c21899ca960fe99282162b5c5bf332 (patch) | |
| tree | e274c6e589ecb7b45c1d8e07069f3132650a78fe /asn1 | |
| parent | 177b63125be8ee69adfedc6a0dc56b20804f8c92 (diff) | |
mpeg-audio: do not put bitrate and sampling rate in source and destination columns
Instead append them to info column.
Bug: 12099
Change-Id: I5451530af2f6cbef519ed541562bffae73e2b1f1
Reviewed-on: https://code.wireshark.org/review/13841
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/mpeg-audio/packet-mpeg-audio-template.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index 4f8e20bffd..ce7cc90d35 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -71,12 +71,10 @@ 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); - set_address(&pinfo->src, AT_NONE, 0, NULL); - col_add_fstr(pinfo->cinfo, COL_DEF_SRC, - "%d kb/s", mpa_bitrate(&mpa) / 1000); - set_address(&pinfo->dst, AT_NONE, 0, NULL); - col_add_fstr(pinfo->cinfo, COL_DEF_DST, - "%g kHz", mpa_frequency(&mpa) / (float)1000); + col_append_fstr(pinfo->cinfo, COL_INFO, + ", %d kb/s, %g kHz", + mpa_bitrate(&mpa) / 1000, + mpa_frequency(&mpa) / (float)1000); } if (tree == NULL) |