diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 16:09:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 16:22:47 +0200 |
| commit | 8d0b899e38b7d33896b05625b195b83697fbbfd8 (patch) | |
| tree | 335c43393cee4576c9545d6d6b5e1d35be306a58 | |
| parent | 7f20440b4c17c26067d588420449ae9066cad237 (diff) | |
| parent | a92538b7c0defc86c55fb91f55dfa36aad192673 (diff) | |
| download | ffmpeg-8d0b899e38b7d33896b05625b195b83697fbbfd8.tar.gz | |
Merge commit 'a92538b7c0defc86c55fb91f55dfa36aad192673'
* commit 'a92538b7c0defc86c55fb91f55dfa36aad192673':
ivi_common: Make sure color planes have been initialized
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ivi_common.c | 5 |
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; |