[FFmpeg-cvslog] rtjpeg: return meaningful error codes
Luca Barbato
git at videolan.org
Wed Aug 14 11:55:38 CEST 2013
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sun Aug 11 20:32:40 2013 +0200| [62cc7a91080194d9ead162516f779f20931220d9] | committer: Luca Barbato
rtjpeg: return meaningful error codes
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62cc7a91080194d9ead162516f779f20931220d9
---
libavcodec/rtjpeg.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c
index 6da7759..9fab681 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);
More information about the ffmpeg-cvslog
mailing list