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/mpegaudiodec.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/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index fd195a1234..e4d29019ab 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -28,6 +28,7 @@ #include "libavutil/audioconvert.h" #include "avcodec.h" +#include "internal.h" #include "get_bits.h" #include "mathops.h" #include "mpegaudiodsp.h" @@ -1602,7 +1603,7 @@ static int mp_decode_frame(MPADecodeContext *s, OUT_INT *samples, /* get output buffer */ if (!samples) { s->frame.nb_samples = s->avctx->frame_size; - if ((ret = s->avctx->get_buffer(s->avctx, &s->frame)) < 0) { + if ((ret = ff_get_buffer(s->avctx, &s->frame)) < 0) { av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -1908,7 +1909,7 @@ static int decode_frame_mp3on4(AVCodecContext *avctx, void *data, /* get output buffer */ s->frame->nb_samples = MPA_FRAME_SIZE; - if ((ret = avctx->get_buffer(avctx, s->frame)) < 0) { + if ((ret = ff_get_buffer(avctx, s->frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } |