[FFmpeg-cvslog] lavf/aiffdec: don't stop parsing after SSND chunk

Matthieu Bouron git at videolan.org
Mon Oct 22 19:44:26 CEST 2012


ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at gmail.com> | Sat Jun 30 17:53:38 2012 +0200| [c68a8a1340e7c8baa17d2dd9d011571f03053087] | committer: Michael Niedermayer

lavf/aiffdec: don't stop parsing after SSND chunk

Some file has ID3 chunk placed after SSND.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/aiffdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 2c2b693..56338c0 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -259,7 +259,7 @@ static int aiff_read_header(AVFormatContext *s)
             offset = avio_rb32(pb);      /* Offset of sound data */
             avio_rb32(pb);               /* BlockSize... don't care */
             offset += avio_tell(pb);    /* Compute absolute data offset */
-            if (st->codec->block_align)    /* Assume COMM already parsed */
+            if (st->codec->block_align && !pb->seekable)    /* Assume COMM already parsed */
                 goto got_sound;
             if (!pb->seekable) {
                 av_log(s, AV_LOG_ERROR, "file is not seekable\n");



More information about the ffmpeg-cvslog mailing list