[FFmpeg-cvslog] avformat/aiffdec: Stop header parsing once a non header packet is reached

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 19 01:39:47 2015 +0100| [ae81e8a9c5e5511a5bdc34b9a10697c835923c0c] | committer: Michael Niedermayer

avformat/aiffdec: Stop header parsing once a non header packet is reached

Fix Ticket3530

Based-on debuging work by Martin Vignali <martin.vignali at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae81e8a9c5e5511a5bdc34b9a10697c835923c0c
---

 libavformat/aiffdec.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index bc1a219..a5ad6cf 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -306,6 +306,9 @@ static int aiff_read_header(AVFormatContext *s)
             if(ff_mov_read_chan(s, pb, st, size) < 0)
                 return AVERROR_INVALIDDATA;
             break;
+        case 0:
+            if (offset > 0 && st->codec->block_align) // COMM && SSND
+                goto got_sound;
         default: /* Jump */
             if (size & 1)   /* Always even aligned */
                 size++;