virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  indeo: Reject impossible FRAMETYPE_NULL

Conflicts:
	libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-15 14:08:06 +02:00
commit fcbf16a76f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/ivi_common.c
View File

@ -989,6 +989,14 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
} }
} }
ctx->buf_invalid[ctx->dst_buf] = 0; 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]) if (ctx->buf_invalid[ctx->dst_buf])
return -1; return -1;