summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-17 16:09:28 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-17 16:22:47 +0200
commit8d0b899e38b7d33896b05625b195b83697fbbfd8 (patch)
tree335c43393cee4576c9545d6d6b5e1d35be306a58 /libavcodec
parent7f20440b4c17c26067d588420449ae9066cad237 (diff)
parenta92538b7c0defc86c55fb91f55dfa36aad192673 (diff)
Merge commit 'a92538b7c0defc86c55fb91f55dfa36aad192673'
* commit 'a92538b7c0defc86c55fb91f55dfa36aad192673': ivi_common: Make sure color planes have been initialized Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ivi_common.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index 681e6e5ee7..4179852d7b 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -999,6 +999,11 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR_PATCHWELCOME;
}
+ if (!ctx->planes[0].bands) {
+ av_log(avctx, AV_LOG_ERROR, "Color planes not initialized yet\n");
+ return AVERROR_INVALIDDATA;
+ }
+
ctx->switch_buffers(ctx);
//{ START_TIMER;