diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-06-29 23:48:34 +0200 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-27 15:24:59 +0100 |
commit | 059a934806d61f7af9ab3fd9f74994b838ea5eba (patch) | |
tree | 119be3b4b7b599563205c350f92e5201424510c8 /libavcodec/nuv.c | |
parent | def97856de6021965db86c25a732d78689bd6bb0 (diff) | |
download | ffmpeg-059a934806d61f7af9ab3fd9f74994b838ea5eba.tar.gz |
lavc: Consistently prefix input buffer defines
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/nuv.c')
-rw-r--r-- | libavcodec/nuv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index eb73c2ff82..c56003c3ad 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -128,7 +128,7 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, avctx->height = c->height = height; ptr = av_fast_realloc(c->decomp_buf, &c->decomp_size, c->height * c->width * 3 / 2 + - FF_INPUT_BUFFER_PADDING_SIZE + + AV_INPUT_BUFFER_PADDING_SIZE + RTJPEG_HEADER_SIZE); if (!ptr) { av_log(avctx, AV_LOG_ERROR, @@ -202,7 +202,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, buf = &buf[12]; buf_size -= 12; if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) { - int outlen = c->decomp_size - FF_INPUT_BUFFER_PADDING_SIZE; + int outlen = c->decomp_size - AV_INPUT_BUFFER_PADDING_SIZE; int inlen = buf_size; if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) { av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); |