diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 14:08:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 14:08:06 +0200 |
| commit | fcbf16a76f3524189e4a6aa93db7147a4b367e10 (patch) | |
| tree | ad67c533df3790283596e7d0ea7567e81351ff87 | |
| parent | c4b904caeaa7664870030c3015e1593f90112c9c (diff) | |
| parent | 5b2a29552ca09edd4646b6aa1828b32912b7ab36 (diff) | |
| download | ffmpeg-fcbf16a76f3524189e4a6aa93db7147a4b367e10.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo: Reject impossible FRAMETYPE_NULL
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ivi_common.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 7577729653..9d34a46155 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -989,6 +989,14 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } } ctx->buf_invalid[ctx->dst_buf] = 0; + } else { + if (ctx->is_scalable) + return AVERROR_INVALIDDATA; + + for (p = 0; p < 3; p++) { + if (!ctx->planes[p].bands[0].buf) + return AVERROR_INVALIDDATA; + } } if (ctx->buf_invalid[ctx->dst_buf]) return -1; |