summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis de Bethencourt <luis@debethencourt.com>2014-04-26 20:51:36 -0400
committerLuis de Bethencourt <luis@debethencourt.com>2014-04-26 20:51:36 -0400
commit5dc2e6bef1cb35e9473dcb785d3711e0892c7e38 (patch)
tree4d940d9a8cb1dbe14f4d252fb7cd06e1aa30c293
parentc9597298f922a783309e7754733a35368345eb33 (diff)
qtdemux: check return from qt_demux_video_caps
Now qtdemux_video_caps() can return NULL. We need to check this return before using it's value. https://bugzilla.gnome.org/show_bug.cgi?id=728987
-rw-r--r--gst/isomp4/qtdemux.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index a81ad7e7c..d5c515f8f 100644
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -7477,6 +7477,9 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
stream->caps =
qtdemux_video_caps (qtdemux, stream, fourcc, stsd_data, &codec);
+ if (G_UNLIKELY (!stream->caps))
+ goto unknown_stream;
+
if (codec) {
list = gst_tag_list_new_empty ();
gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,