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/dfa.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/dfa.c')
| -rw-r--r-- | libavcodec/dfa.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index cde4dc229b..9e0ed893d5 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -21,6 +21,7 @@ */ #include "avcodec.h" +#include "internal.h" #include "bytestream.h" #include "libavutil/imgutils.h" @@ -325,7 +326,7 @@ static int dfa_decode_frame(AVCodecContext *avctx, if (s->pic.data[0]) avctx->release_buffer(avctx, &s->pic); - if ((ret = avctx->get_buffer(avctx, &s->pic))) { + if ((ret = ff_get_buffer(avctx, &s->pic))) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } |