From 5a8783f5b12e017967ce178bac3d1826630dea1a Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Mon, 10 Sep 2012 21:40:21 +0000 Subject: Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860 --- epan/dissectors/packet-mpeg-pes.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-mpeg-pes.c') diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 474fae120c..d5a3fd9c30 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -830,7 +830,7 @@ static void dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static gboolean -dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { int prefix; int stream; @@ -887,7 +887,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 64 * 8; es = tvb_new_subset_remaining(tvb, offset / 8); - dissect_mpeg_pes(es, pinfo, tree); + dissect_mpeg_pes(es, pinfo, tree, NULL); } else if (stream == STREAM_SEQUENCE_EXTENSION) { tvbuff_t *es; @@ -895,7 +895,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tree, hf_mpeg_video_sequence_extension); es = tvb_new_subset_remaining(tvb, offset / 8); - dissect_mpeg_pes(es, pinfo, tree); + dissect_mpeg_pes(es, pinfo, tree, NULL); } else if (stream == STREAM_GOP) { tvbuff_t *es; @@ -903,7 +903,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tree, hf_mpeg_video_group_of_pictures); es = tvb_new_subset_remaining(tvb, offset / 8); - dissect_mpeg_pes(es, pinfo, tree); + dissect_mpeg_pes(es, pinfo, tree, NULL); } else if (stream == STREAM_PACK) { if (tvb_get_guint8(tvb, offset / 8) >> 6 == 1) { dissect_mpeg_pes_pack_header(tvb, offset, pinfo, tree); @@ -968,7 +968,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) es = tvb_new_subset(tvb, offset / 8, -1, length / 8); if (tvb_get_ntoh24(es, 0) == PES_PREFIX) - dissect_mpeg_pes(es, pinfo, tree); + dissect_mpeg_pes(es, pinfo, tree, NULL); else if (tvb_get_guint8(es, 0) == 0xff) dissect_mpeg(es, pinfo, tree); else -- cgit v1.2.3