From 662ec520ae6a3f411741695a546193f454ce3dc6 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Mon, 10 Jan 2011 12:34:03 +0100 Subject: [PATCH] qtdemux: simplify retrieving stsd child entry atom --- gst/qtdemux/qtdemux.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 01701a2..209f9e2 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -6328,13 +6328,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) esds = NULL; pasp = NULL; - mp4v = qtdemux_tree_get_child_by_type (stsd, FOURCC_mp4v); - if (!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); + /* pick 'the' stsd child */ + mp4v = qtdemux_tree_get_child_by_type (stsd, fourcc); if (mp4v) { esds = qtdemux_tree_get_child_by_type (mp4v, FOURCC_esds); pasp = qtdemux_tree_get_child_by_type (mp4v, FOURCC_pasp); -- 2.7.4