virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'

Browse Source 
* commit '74512f7e369da40e1148c92b58cd8e59f7737b8f':
  8svx: Return proper error codes

Conflicts:
	libavcodec/8svx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-02 21:45:58 +02:00
commit 50c6bffb67
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/8svx.c
View File

@ -101,7 +101,7 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
} }
if (avpkt->size < (hdr_size + 1) * avctx->channels) { if (avpkt->size < (hdr_size + 1) * avctx->channels) {
av_log(avctx, AV_LOG_ERROR, "packet size is too small\n"); av_log(avctx, AV_LOG_ERROR, "packet size is too small\n");
return AVERROR(EINVAL); return AVERROR_INVALIDDATA;
} }
esc->fib_acc[0] = avpkt->data[1] + 128; esc->fib_acc[0] = avpkt->data[1] + 128;
@ -124,7 +124,7 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
} }
if (!esc->data[0]) { if (!esc->data[0]) {
av_log(avctx, AV_LOG_ERROR, "unexpected empty packet\n"); av_log(avctx, AV_LOG_ERROR, "unexpected empty packet\n");
return AVERROR(EINVAL); return AVERROR_INVALIDDATA;
} }
/* decode next piece of data from the buffer */ /* decode next piece of data from the buffer */