generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc: Consistently prefix input buffer defines

Browse Source 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara
2015-06-29 23:48:34 +02:00
parent def97856de
commit 059a934806
150 changed files with 273 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/nuv.c
View File

@@ -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");