RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '6234058148d6e1ee765913b678a22385a87bffac' 

* commit '6234058148d6e1ee765913b678a22385a87bffac':
  huffyuv: Return proper error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-04 04:57:50 +02:00
parent 2b9044a6f0 6234058148
commit d5fde13bd2
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/huffyuvdec.c
View File

@ -105,7 +105,7 @@ static int read_len_table(uint8_t *dst, GetBitContext *gb, int n)
repeat = get_bits(gb, 8);
if (i + repeat > n || get_bits_left(gb) < 0) {
av_log(NULL, AV_LOG_ERROR, "Error reading huffman table\n");
return -1;
return AVERROR_INVALIDDATA;
}
while (repeat--)
dst[i++] = val;
@ -294,7 +294,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
int method, interlace;
if (avctx->extradata_size < 4)
return -1;
return AVERROR_INVALIDDATA;
method = avctx->extradata[0];
s->decorrelate = method & 64 ? 1 : 0;