diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-09 01:03:13 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 18:56:45 +0200 |
commit | 221bbd002c62ede7427d465922b91f75f055a1a9 (patch) | |
tree | 57c49edc057ddb00420898e444123295b1336866 | |
parent | fffc9316daab9690ab0e124a0cfbcbb0faea836c (diff) | |
download | ffmpeg-221bbd002c62ede7427d465922b91f75f055a1a9.tar.gz |
atrac3: fix error handling
decode_tonal_components returns a proper AVERROR.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5eaed6d33689cc6f6e7c07463ede6b387b08afc4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/atrac3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 6216536363..8475aa1d09 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -661,8 +661,8 @@ static int decode_channel_sound_unit(ATRAC3Context *q, GetBitContext *gb, snd->num_components = decode_tonal_components(gb, snd->components, snd->bands_coded); - if (snd->num_components == -1) - return -1; + if (snd->num_components < 0) + return snd->num_components; num_subbands = decode_spectrum(gb, snd->spectrum); |