diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-16 20:32:35 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-01-07 09:43:56 +0100 |
| commit | 843b330c3c9a3fc60bee5638e1fb47ace5db0c73 (patch) | |
| tree | 14341b1d2862922e581b442a85f4e8841d49e224 /libavcodec | |
| parent | 33b88170d76a5e97722c0e10ef97f284badbf98b (diff) | |
| download | ffmpeg-843b330c3c9a3fc60bee5638e1fb47ace5db0c73.tar.gz | |
ivi_common: Make sure color planes have been initialized
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit a92538b7c0defc86c55fb91f55dfa36aad192673)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 38bd229af9c4fa5897fc1a69e73a04c55f78647f)
Diffstat (limited to 'libavcodec')
| -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 91a42b152f..84695a058b 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -892,6 +892,11 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *data_size, 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; |