From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 1 Jan 2014 19:03:05 +0000 (+0100)
Subject: lavc: allow the caller to override dimensions in ff_get_buffer()
X-Git-Tag: android-x86-6.0-r1~10^2~2319
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f7e85ee996b3886c2b13e928b83277382311af96;p=android-x86%2Fexternal-ffmpeg.git

lavc: allow the caller to override dimensions in ff_get_buffer()

This will be useful for allocating edges in the encoders.
---

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 1b29b1b884..ed68d0f555 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -572,12 +572,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
 int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
 {
+    int override_dimensions = 1;
     int ret;
 
     switch (avctx->codec_type) {
     case AVMEDIA_TYPE_VIDEO:
-        frame->width  = FFMAX(avctx->width, avctx->coded_width);
-        frame->height = FFMAX(avctx->height, avctx->coded_height);
+        if (frame->width <= 0 || frame->height <= 0) {
+            frame->width  = FFMAX(avctx->width, avctx->coded_width);
+            frame->height = FFMAX(avctx->height, avctx->coded_height);
+            override_dimensions = 0;
+        }
         if (frame->format < 0)
             frame->format              = avctx->pix_fmt;
         if (!frame->sample_aspect_ratio.num)
@@ -738,7 +742,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
     ret = avctx->get_buffer2(avctx, frame, flags);
 
-    if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
+    if (avctx->codec_type == AVMEDIA_TYPE_VIDEO && !override_dimensions) {
         frame->width  = avctx->width;
         frame->height = avctx->height;
     }