Mercurial > libavformat.hg

changeset 3297:df2df4c07d12 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
try to demux even if codec is not recognized, should demux M1F1-float32C-AFsp.aif and fix #454
author bcoudurier
date Thu, 15 May 2008 22:47:40 +0000
parents 1d7a7c5ea015
children edabe3db2b6e
files aiff.c
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/aiff.c	Thu May 15 22:37:31 2008 +0000
+++ b/aiff.c	Thu May 15 22:47:40 2008 +0000
@@ -366,7 +366,7 @@
             offset = get_be32(pb);      /* Offset of sound data */
             get_be32(pb);               /* BlockSize... don't care */
             offset += url_ftell(pb);    /* Compute absolute data offset */
-            if (st->codec->codec_id)    /* Assume COMM already parsed */
+            if (st->codec->block_align)    /* Assume COMM already parsed */
                 goto got_sound;
             if (url_is_streamed(pb)) {
                 av_log(s, AV_LOG_ERROR, "file is not seekable\n");
@@ -390,8 +390,10 @@
         }
     }
 
-    /* End of loop and didn't get sound */
-    return AVERROR_INVALIDDATA;
+    if (!st->codec->block_align) {
+        av_log(s, AV_LOG_ERROR, "could not find COMM tag\n");
+        return -1;
+    }
 
 got_sound:
     /* Now positioned, get the sound data start and end */