aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-02-29 06:20:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-02-29 06:27:38 +0100
commitc2500635235d809e0c0ac526a7e13072ab7c8900 (patch)
tree623e25483adae3ba3992f50841babf2f190b8457 /ffmpeg.c
parent8534881a389044ec51adabcf979616b4875ac072 (diff)
downloadffmpeg-c2500635235d809e0c0ac526a7e13072ab7c8900.tar.gz
get_buffers: Check that pix_fmt is not NONE.
This is somewhat redundant as no decoder should call get_buffer() with such argument. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 06fb2535a9..c43192d8f9 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -553,7 +553,7 @@ static int codec_get_buffer(AVCodecContext *s, AVFrame *frame)
FrameBuffer *buf;
int ret, i;
- if(av_image_check_size(s->width, s->height, 0, s))
+ if(av_image_check_size(s->width, s->height, 0, s) || s->pix_fmt<0)
return -1;
if (!ist->buffer_pool && (ret = alloc_buffer(s, ist, &ist->buffer_pool)) < 0)