Merge commit '8feac29cc46270cc89d6016340e7bac780877131'

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

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

diff --cc libavcodec/utils.c
index d24854a9876045f0934509a740cced4f03a51613,c88b34649f87ea48e41856524ae5ea477488ddbc..40567f51d3fe4a89eb4e534c154930641ca13129
--- 1/libavcodec/utils.c
--- 2/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);