diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 19:23:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 19:53:37 +0200 |
| commit | bb015b519e29a125b794bf1a5e18c422bcb4090c (patch) | |
| tree | 26195c9564b7b46800b2606e659b70e54fd11a92 /libavcodec/mxpegdec.c | |
| parent | acf7c5b8ee63d4a3614dd93aa7bcc23d582c3ccd (diff) | |
| parent | 0ab76ddf313eeab70d06619ae0376fd7dd40761b (diff) | |
| download | ffmpeg-bb015b519e29a125b794bf1a5e18c422bcb4090c.tar.gz | |
Merge commit '0ab76ddf313eeab70d06619ae0376fd7dd40761b' into release/0.10
* commit '0ab76ddf313eeab70d06619ae0376fd7dd40761b':
avcodec: Introduce ff_get_buffer
Conflicts:
libavcodec/8svx.c
libavcodec/dpcm.c
libavcodec/utils.c
libavcodec/vmdav.c
libavcodec/yop.c
See: 668494acd8b20f974c7722895d4a6a14c1005f1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mxpegdec.c')
| -rw-r--r-- | libavcodec/mxpegdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index 9f9212ce9b..636dd7076e 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -25,6 +25,7 @@ * MxPEG decoder */ +#include "internal.h" #include "mjpeg.h" #include "mjpegdec.h" @@ -250,7 +251,7 @@ static int mxpeg_decode_frame(AVCodecContext *avctx, /* use stored SOF data to allocate current picture */ if (jpg->picture_ptr->data[0]) avctx->release_buffer(avctx, jpg->picture_ptr); - if (avctx->get_buffer(avctx, jpg->picture_ptr) < 0) { + if (ff_get_buffer(avctx, jpg->picture_ptr) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return AVERROR(ENOMEM); } @@ -269,7 +270,7 @@ static int mxpeg_decode_frame(AVCodecContext *avctx, /* allocate dummy reference picture if needed */ if (!reference_ptr->data[0] && - avctx->get_buffer(avctx, reference_ptr) < 0) { + ff_get_buffer(avctx, reference_ptr) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return AVERROR(ENOMEM); } |