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/roqvideoenc.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/roqvideoenc.c')
| -rw-r--r-- | libavcodec/roqvideoenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index 88d6224eac..8ecb23c26b 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -59,6 +59,7 @@ #include "roqvideo.h" #include "bytestream.h" #include "elbg.h" +#include "internal.h" #include "mathops.h" #define CHROMA_BIAS 1 @@ -1031,8 +1032,8 @@ static int roq_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s if (enc->first_frame) { /* Alloc memory for the reconstruction data (we must know the stride for that) */ - if (avctx->get_buffer(avctx, enc->current_frame) || - avctx->get_buffer(avctx, enc->last_frame)) { + if (ff_get_buffer(avctx, enc->current_frame) || + ff_get_buffer(avctx, enc->last_frame)) { av_log(avctx, AV_LOG_ERROR, " RoQ: get_buffer() failed\n"); return -1; } |