diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 01:39:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 01:39:47 +0100 |
| commit | ae81e8a9c5e5511a5bdc34b9a10697c835923c0c (patch) | |
| tree | 9286808d993bbb6d17a7980077defa737c322170 | |
| parent | d2009c77fb0018e602e6f0fe7a4a90c2de03c4f0 (diff) | |
| download | ffmpeg-ae81e8a9c5e5511a5bdc34b9a10697c835923c0c.tar.gz | |
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>
| -rw-r--r-- | libavformat/aiffdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
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++; |