From 9f8008a9815ed5ee8846de2bb97c980ddb7b2485 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 7 Apr 2011 00:24:53 +0200 Subject: [PATCH] move image check down in ffplay.c Signed-off-by: Michael Niedermayer --- ffplay.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ffplay.c b/ffplay.c index 2067a8f8b0..56236d861b 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1582,9 +1582,6 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) int i, w, h, stride[4]; unsigned edge; - if(av_image_check_size(w, h, 0, codec)) - return -1; - if (codec->codec->capabilities & CODEC_CAP_NEG_LINESIZES) perms |= AV_PERM_NEG_LINESIZES; @@ -1597,6 +1594,10 @@ static int input_get_buffer(AVCodecContext *codec, AVFrame *pic) w = codec->width; h = codec->height; + + if(av_image_check_size(w, h, 0, codec)) + return -1; + avcodec_align_dimensions2(codec, &w, &h, stride); edge = codec->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width(); w += edge << 1;