Browse Source

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>
tags/n0.11
Michael Niedermayer 13 years ago
parent
commit
c250063523
3 changed files with 3 additions and 3 deletions
  1. +1
    -1
      ffmpeg.c
  2. +1
    -1
      ffplay.c
  3. +1
    -1
      libavcodec/utils.c

+ 1
- 1
ffmpeg.c View File

@@ -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)


+ 1
- 1
ffplay.c View File

@@ -1564,7 +1564,7 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic)
w = codec->width;
h = codec->height;

if(av_image_check_size(w, h, 0, codec))
if(av_image_check_size(w, h, 0, codec) || codec->pix_fmt<0)
return -1;

avcodec_align_dimensions2(codec, &w, &h, stride);


+ 1
- 1
libavcodec/utils.c View File

@@ -414,7 +414,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
return -1;
}

if(av_image_check_size(w, h, 0, s))
if(av_image_check_size(w, h, 0, s) || s->pix_fmt<0)
return -1;

if (!avci->buffer) {


Loading…
Cancel
Save