diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
| commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
| tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-mp4ves.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96.
Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-mp4ves.c')
| -rw-r--r-- | epan/dissectors/packet-mp4ves.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index 3fe8097a5f..3ea5d00c80 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -594,7 +594,7 @@ dissect_mp4ves_VisualObject(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, bit_offset+=24; proto_tree_add_bits_item(tree, hf_mp4ves_start_code, tvb, bit_offset, 8, ENC_BIG_ENDIAN); bit_offset+= 8; - if(tvb_captured_length_remaining(tvb,(bit_offset>>3))<=0){ + if(tvb_length_remaining(tvb,(bit_offset>>3))<=0){ item = proto_tree_add_text(tree, tvb, 0, -1, "Config string too short"); PROTO_ITEM_SET_GENERATED(item); return -1; @@ -742,7 +742,7 @@ dissect_mp4ves(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ - if (tvb_captured_length(tvb)< 4){ + if (tvb_length(tvb)< 4){ /* To short to be a start code */ proto_tree_add_text(mp4ves_tree, tvb, bit_offset>>3, -1, "Data"); return; @@ -842,7 +842,7 @@ dissect_mp4ves_par_decoderConfigurationInformation(tvbuff_t *tvb, packet_info *p dissect_mp4ves_config(tvb, pinfo, tree); - return tvb_captured_length(tvb); + return tvb_length(tvb); } typedef struct _mp4ves_capability_t { @@ -893,7 +893,7 @@ dissect_mp4ves_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree, voi } } - return tvb_captured_length(tvb); + return tvb_length(tvb); } void |