From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 19 Apr 2013 19:43:15 +0000 (+0200)
Subject: avcodec: Fix lowres handling in buffer allocation
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=05b2c998c7bfea642e3541787ab5dd3847e2ba81;p=ffmpeg

avcodec: Fix lowres handling in buffer allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 0ea1b53a8b3..1733d0f1a32 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -621,8 +621,8 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
 
     switch (avctx->codec->type) {
     case AVMEDIA_TYPE_VIDEO:
-        frame->width  = FFMAX(avctx->width, avctx->coded_width);
-        frame->height = FFMAX(avctx->height, avctx->coded_height);
+        frame->width  = FFMAX(avctx->width , -((-avctx->coded_width )>>avctx->lowres));
+        frame->height = FFMAX(avctx->height, -((-avctx->coded_height)>>avctx->lowres));
         if (frame->format < 0)
             frame->format              = avctx->pix_fmt;
         if (!frame->sample_aspect_ratio.num)