mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: some optional QT specified stsd MPEG-4 atoms also apply to H264

Browse source 
Fixes #596319.
This commit is contained in:
Mark Nauwelaerts 2009-09-25 19:21:32 +02:00
parent e21d16a4f8
commit 0fac7b5347
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/qtdemux/qtdemux.c
View file

@ -3236,6 +3236,12 @@ qtdemux_parse_node (GstQTDemux * qtdemux, GNode * node, const guint8 * buffer,
} }
break; break;
} }
case FOURCC_avc1:
{
GST_MEMDUMP_OBJECT (qtdemux, "avc1", buffer, end - buffer);
qtdemux_parse_container (qtdemux, node, buffer + 0x56, end);
break;
}
case FOURCC_mjp2: case FOURCC_mjp2:
{ {
qtdemux_parse_container (qtdemux, node, buffer + 86, end); qtdemux_parse_container (qtdemux, node, buffer + 86, end);
@ -4298,6 +4304,10 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
esds = NULL; esds = NULL;
pasp = NULL; pasp = NULL;
mp4v = qtdemux_tree_get_child_by_type (stsd, FOURCC_mp4v); mp4v = qtdemux_tree_get_child_by_type (stsd, FOURCC_mp4v);
/* H264 is MPEG-4 after all,
* and qt seems to put MPEG-4 stuff in there as well */
if (!mp4v)
mp4v = qtdemux_tree_get_child_by_type (stsd, FOURCC_avc1);
if (mp4v) { if (mp4v) {
esds = qtdemux_tree_get_child_by_type (mp4v, FOURCC_esds); esds = qtdemux_tree_get_child_by_type (mp4v, FOURCC_esds);
pasp = qtdemux_tree_get_child_by_type (mp4v, FOURCC_pasp); pasp = qtdemux_tree_get_child_by_type (mp4v, FOURCC_pasp);