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

Merge commit '62cc7a91080194d9ead162516f779f20931220d9' 

* commit '62cc7a91080194d9ead162516f779f20931220d9':
  rtjpeg: return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-14 11:51:28 +02:00
parent 8da4305eb5 62cc7a9108
commit d12bc01ec5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/rtjpeg.c
View File

@ -56,7 +56,7 @@ static inline int get_block(GetBitContext *gb, int16_t *block, const uint8_t *sc
// number of non-zero coefficients // number of non-zero coefficients
coeff = get_bits(gb, 6); coeff = get_bits(gb, 6);
if (get_bits_left(gb) < (coeff << 1)) if (get_bits_left(gb) < (coeff << 1))
return -1; return AVERROR_INVALIDDATA;
// normally we would only need to clear the (63 - coeff) last values, // normally we would only need to clear the (63 - coeff) last values,
// but since we do not know where they are we just clear the whole block // but since we do not know where they are we just clear the whole block
@ -73,7 +73,7 @@ static inline int get_block(GetBitContext *gb, int16_t *block, const uint8_t *sc
// 4 bits per coefficient // 4 bits per coefficient
ALIGN(4); ALIGN(4);
if (get_bits_left(gb) < (coeff << 2)) if (get_bits_left(gb) < (coeff << 2))
return -1; return AVERROR_INVALIDDATA;
while (coeff) { while (coeff) {
ac = get_sbits(gb, 4); ac = get_sbits(gb, 4);
if (ac == -8) if (ac == -8)
@ -84,7 +84,7 @@ static inline int get_block(GetBitContext *gb, int16_t *block, const uint8_t *sc
// 8 bits per coefficient // 8 bits per coefficient
ALIGN(8); ALIGN(8);
if (get_bits_left(gb) < (coeff << 3)) if (get_bits_left(gb) < (coeff << 3))
return -1; return AVERROR_INVALIDDATA;
while (coeff) { while (coeff) {
ac = get_sbits(gb, 8); ac = get_sbits(gb, 8);
PUT_COEFF(ac); PUT_COEFF(ac);