From: Luca Barbato <lu_zero@gentoo.org>
Date: Mon, 8 Jul 2013 23:03:13 +0000 (+0200)
Subject: atrac3: fix error handling
X-Git-Tag: android-x86-4.4-r1~2441
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5eaed6d33689cc6f6e7c07463ede6b387b08afc4;p=android-x86%2Fexternal-ffmpeg.git

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>
---

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 18957cb7ef..0b56352517 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -665,8 +665,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);