From 461e306bec11d9db189739b9a85f95ff31be93da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 26 Nov 2016 13:53:49 +0200 Subject: riff-media: Check if caps are NULL before using them for the first time, not afterwards Otherwise we'll get a g_critical() before erroring out cleanly on https://samples.mplayerhq.hu/A-codecs/ATRAC3/SND0.AT3 --- gst-libs/gst/riff/riff-media.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index 31d6d1b7d..a103a389c 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -1732,6 +1732,11 @@ gst_riff_create_audio_caps (guint16 codec_id, *codec_name = g_strdup ("Ogg-AVI"); } + if (caps == NULL) { + GST_WARNING ("Unknown WAVE_FORMAT_EXTENSIBLE audio format"); + return NULL; + } + if (strf != NULL) { /* If channel_mask == 0 and channels > 1 let's * assume default layout as some wav files don't have the @@ -1750,10 +1755,6 @@ gst_riff_create_audio_caps (guint16 codec_id, rate_chan = FALSE; } - if (caps == NULL) { - GST_WARNING ("Unknown WAVE_FORMAT_EXTENSIBLE audio format"); - return NULL; - } break; } /* can anything decode these? pitfdll? */ -- cgit v1.2.1