aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-08-11 20:32:40 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-08-13 14:04:55 +0200
commit62cc7a91080194d9ead162516f779f20931220d9 (patch)
tree170cd70f7862335c912a64048866b3dd1afa0786
parent2df0776c2293efb0ac12c003843ce19332342e01 (diff)
downloadffmpeg-62cc7a91080194d9ead162516f779f20931220d9.tar.gz
rtjpeg: return meaningful error codes
-rw-r--r--libavcodec/rtjpeg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c
index 6da7759407..9fab6816eb 100644
--- a/libavcodec/rtjpeg.c
+++ b/libavcodec/rtjpeg.c
@@ -56,7 +56,7 @@ static inline int get_block(GetBitContext *gb, int16_t *block, const uint8_t *sc
// number of non-zero coefficients
coeff = get_bits(gb, 6);
if (get_bits_left(gb) < (coeff << 1))
- return -1;
+ return AVERROR_INVALIDDATA;
// 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
@@ -73,7 +73,7 @@ static inline int get_block(GetBitContext *gb, int16_t *block, const uint8_t *sc
// 4 bits per coefficient
ALIGN(4);
if (get_bits_left(gb) < (coeff << 2))
- return -1;
+ return AVERROR_INVALIDDATA;
while (coeff) {
ac = get_sbits(gb, 4);
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
ALIGN(8);
if (get_bits_left(gb) < (coeff << 3))
- return -1;
+ return AVERROR_INVALIDDATA;
while (coeff) {
ac = get_sbits(gb, 8);
PUT_COEFF(ac);