From 8fd69f2cb700b34af8b804e112ad24a857cb873c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 20 May 2010 10:19:29 +0200 Subject: [PATCH] oggdemux: Drop all other Ogg VP8 header packets and make VP8 mapping check a bit more strict --- ext/ogg/gstoggdemux.c | 4 ++-- ext/ogg/gstoggstream.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index c05da7f..348acff 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -490,8 +490,8 @@ gst_ogg_demux_chain_peer (GstOggPad * pad, ogg_packet * packet, /* We don't push header packets for VP8 */ cret = gst_ogg_demux_combine_flows (ogg, pad, GST_FLOW_OK); goto done; - } else if (packet->b_o_s || (packet->bytes >= 6 - && memcmp (packet->packet, "OVP80\1", 4) == 0)) { + } else if (packet->b_o_s || (packet->bytes >= 5 + && memcmp (packet->packet, "OVP80", 6) == 0)) { /* We don't push header packets for VP8 */ cret = gst_ogg_demux_combine_flows (ogg, pad, GST_FLOW_OK); goto done; diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c index 53db77b..0746b83 100644 --- a/ext/ogg/gstoggstream.c +++ b/ext/ogg/gstoggstream.c @@ -1636,7 +1636,7 @@ static const GstOggMap mappers[] = { granulepos_to_key_granule_dirac }, { - "OVP80\1", 6, 4, + "OVP80\1\1", 7, 4, "video/x-vp8", setup_vp8_mapper, granulepos_to_granule_vp8, -- 2.7.4