aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-05 15:18:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-05 15:18:12 +0100
commit874c5b02c4117d5261365d0de727c0b4dc9363f6 (patch)
tree6cab3de646de322069cc3b3ebda8a4425ea07040 /libavcodec/utils.c
parent4727611d489387aed926469ac757b2f1dfea3e33 (diff)
parent594d4d5df3c70404168701dd5c90b7e6e5587793 (diff)
downloadffmpeg-874c5b02c4117d5261365d0de727c0b4dc9363f6.tar.gz
Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'
* commit '594d4d5df3c70404168701dd5c90b7e6e5587793': lavc: add a wrapper for AVCodecContext.get_buffer(). Conflicts: libavcodec/4xm.c libavcodec/8svx.c libavcodec/bmv.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/kmvc.c libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/pcx.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/rl2.c libavcodec/snow.c libavcodec/targa.c libavcodec/tscc.c libavcodec/txd.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vb.c libavcodec/vmdav.c libavcodec/vp56.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 48ef679106..be6b3a9e23 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -585,6 +585,11 @@ int avcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame)
}
}
+int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame)
+{
+ return avctx->get_buffer(avctx, frame);
+}
+
void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)
{
int i;
@@ -639,7 +644,7 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic)
if (pic->data[0] == NULL) {
/* We will copy from buffer, so must be readable */
pic->buffer_hints |= FF_BUFFER_HINTS_READABLE;
- return s->get_buffer(s, pic);
+ return ff_get_buffer(s, pic);
}
assert(s->pix_fmt == pic->format);
@@ -657,7 +662,7 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic)
pic->data[i] = pic->base[i] = NULL;
pic->opaque = NULL;
/* Allocate new frame */
- if ((ret = s->get_buffer(s, pic)))
+ if ((ret = ff_get_buffer(s, pic)))
return ret;
/* Copy image data from old buffer to new buffer */
av_picture_copy((AVPicture *)pic, (AVPicture *)&temp_pic, s->pix_fmt, s->width,
@@ -2679,7 +2684,7 @@ int ff_thread_get_buffer(AVCodecContext *avctx, AVFrame *f)
ff_init_buffer_info(avctx, f);
- return avctx->get_buffer(avctx, f);
+ return ff_get_buffer(avctx, f);
}
void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f)