From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 24 Feb 2014 09:15:16 +0000 (+0100)
Subject: Merge commit '8feac29cc46270cc89d6016340e7bac780877131'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7a9946d386a3736abde0d7584bef526dc779a36f;p=ffmpeg

Merge commit '8feac29cc46270cc89d6016340e7bac780877131'

* commit '8feac29cc46270cc89d6016340e7bac780877131':
  lavc: use AVFrame API properly in ff_reget_buffer()

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

7a9946d386a3736abde0d7584bef526dc779a36f
diff --cc libavcodec/utils.c
index d24854a9876,c88b34649f8..40567f51d3f
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -979,17 -752,9 +979,17 @@@ FF_ENABLE_DEPRECATION_WARNING
      return ret;
  }
  
 -int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame)
 +int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
 +{
 +    int ret = get_buffer_internal(avctx, frame, flags);
 +    if (ret < 0)
 +        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
 +    return ret;
 +}
 +
 +static int reget_buffer_internal(AVCodecContext *avctx, AVFrame *frame)
  {
-     AVFrame tmp;
+     AVFrame *tmp;
      int ret;
  
      av_assert0(avctx->codec_type == AVMEDIA_TYPE_VIDEO);