From ae81e8a9c5e5511a5bdc34b9a10697c835923c0c Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 19 Mar 2015 01:39:47 +0100
Subject: avformat/aiffdec: Stop header parsing once a non header packet is
 reached

Fix Ticket3530

Based-on debuging work by Martin Vignali <martin.vignali@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavformat/aiffdec.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'libavformat')

diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index bc1a21937d..a5ad6cf956 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++;
-- 
cgit v1.2.3