summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-07 13:27:01 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-07 13:27:01 +0100
commitfdfbb793c313ddd069581c0140eff43d9f1d69f9 (patch)
tree64bae2ceef9562a4f17b674541c4d071cbf53fd2
parentdd11615bbca6ca38e0d9696cc3a4e7ee9c324cdc (diff)
ffv1dec: propagate return code from ffv1_common_init()
Fixes Ticket1824 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/ffv1dec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 9cd0cff344..75d2be670a 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;