diff options
author | Edward Hervey <edward.hervey@collabora.co.uk> | 2012-06-14 15:04:33 +0200 |
---|---|---|
committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2012-06-14 15:04:33 +0200 |
commit | 1ca115c44bca894a6bbb2334e60a361dbd64a157 (patch) | |
tree | febf8e82cee9d070f601d696b6feb291831d2aa4 | |
parent | 9761a6501b518a554fc5e52de8e9acdc4f8ced9a (diff) | |
download | gst-libav-1ca115c44bca894a6bbb2334e60a361dbd64a157.tar.gz |
ffmpegviddec: Properly error out when codec doesn't open
Avoids ending up using an un-set codec
-rw-r--r-- | ext/ffmpeg/gstffmpegviddec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/ffmpeg/gstffmpegviddec.c b/ext/ffmpeg/gstffmpegviddec.c index 3554ead..a4afe08 100644 --- a/ext/ffmpeg/gstffmpegviddec.c +++ b/ext/ffmpeg/gstffmpegviddec.c @@ -413,7 +413,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, { GstFFMpegVidDec *ffmpegdec; GstFFMpegVidDecClass *oclass; - gboolean ret = TRUE; + gboolean ret = FALSE; ffmpegdec = (GstFFMpegVidDec *) decoder; oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); @@ -528,6 +528,8 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, gst_video_codec_state_unref (ffmpegdec->input_state); ffmpegdec->input_state = gst_video_codec_state_ref (state); + ret = TRUE; + done: GST_OBJECT_UNLOCK (ffmpegdec); |