[FFmpeg-cvslog] ffv1dec: propagate return code from ffv1_common_init()

Michael Niedermayer git at videolan.org
Wed Nov 7 13:31:37 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov  7 13:27:01 2012 +0100| [fdfbb793c313ddd069581c0140eff43d9f1d69f9] | committer: Michael Niedermayer

ffv1dec: propagate return code from ffv1_common_init()

Fixes Ticket1824
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fdfbb793c313ddd069581c0140eff43d9f1d69f9
---

 libavcodec/ffv1dec.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 9cd0cff..75d2be6 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -717,7 +717,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
     FFV1Context *f = avctx->priv_data;
     int ret;
 
-    ffv1_common_init(avctx);
+    if ((ret = ffv1_common_init(avctx)) < 0)
+        return ret;
 
     if (avctx->extradata && (ret = read_extra_header(f)) < 0)
         return ret;



More information about the ffmpeg-cvslog mailing list