diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-08-25 00:50:20 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-08-25 00:50:20 +0000 |
| commit | f704c0f368901cc9e1c36fb462f518376e8a3791 (patch) | |
| tree | fb1f338c68d779674a23aa86528c22dd2584d2a5 /epan/dissectors/packet-mpeg-pes.c | |
| parent | 867fd260f1795b64c3634c65bfb9b4eb93192e3d (diff) | |
From Shaun Jackman:
* asn1/mpeg/packet-mpeg-pes-template.c (proto_register_mpeg_pes):
Register the dissectors mpeg and mpeg-pes.
* epan/dissectors/packet-mp2t.c (dissect_tsp): Call the mpeg-pes
dissector.
(ett_mp2t_header, ett_mp2t_af): New subtree identifiers.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22650 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-mpeg-pes.c')
| -rw-r--r-- | epan/dissectors/packet-mpeg-pes.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 95c45bd74e..b25bbe7717 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -733,7 +733,7 @@ dissect_mpeg_pes_pack_header(tvbuff_t *tvb, unsigned offset, return offset; } -void +static void dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); static gboolean @@ -885,7 +885,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static heur_dissector_list_t heur_subdissector_list; -void +static void dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree)) { @@ -1210,15 +1210,14 @@ proto_register_mpeg_pes(void) proto_mpeg = proto_register_protocol( "Moving Picture Experts Group", "MPEG", "mpeg"); + register_dissector("mpeg", dissect_mpeg, proto_mpeg); register_heur_dissector_list("mpeg", &heur_subdissector_list); - if (proto_mpeg_pes != -1) - return; - proto_mpeg_pes = proto_register_protocol( "Packetized Elementary Stream", "MPEG PES", "mpeg-pes"); proto_register_field_array(proto_mpeg_pes, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + register_dissector("mpeg-pes", dissect_mpeg_pes, proto_mpeg_pes); } void |