From: Luca Barbato <lu_zero@gentoo.org>
Date: Mon, 22 Oct 2012 16:50:32 +0000 (+0200)
Subject: mp3: exit on parsing error in mp_decode_frame
X-Git-Tag: v9_beta2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c03cc68386443f1e96ab6fb358220faf67cd5ff;p=platform%2Fupstream%2Flibav.git

mp3: exit on parsing error in mp_decode_frame

Properly forward mp_decode_layer3 errors, mp_decode_layer1 and
mp_decode_layer2 do not return errors.

Based on a patch by Michael Niedermayer.
---

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index d08177e..169254f 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -1572,6 +1572,9 @@ static int mp_decode_frame(MPADecodeContext *s, OUT_INT *samples,
     default:
         nb_frames = mp_decode_layer3(s);
 
+        if (nb_frames < 0)
+            return nb_frames;
+
         s->last_buf_size=0;
         if (s->in_gb.buffer) {
             align_get_bits(&s->gb);