diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-05-20 10:19:29 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-05-20 10:19:29 +0200 |
| commit | 8fd69f2cb700b34af8b804e112ad24a857cb873c (patch) | |
| tree | 3a485b05ac4fd6e975bc1f728f925a04f8561f9e | |
| parent | 563a96ef1a466248ead802c8ce5ea89604d00e5f (diff) | |
oggdemux: Drop all other Ogg VP8 header packets and make VP8 mapping check a bit more strict
| -rw-r--r-- | ext/ogg/gstoggdemux.c | 4 | ||||
| -rw-r--r-- | 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 c05da7ff4..348acffc9 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 53db77bc6..0746b8374 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, |