lavf/aiffdec: Default to full rate qcelp as QT does.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 11 Oct 2016 07:49:35 +0000 (09:49 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 11 Oct 2016 07:49:35 +0000 (09:49 +0200)
Fixes decoding of the output file from ticket #4009.

libavformat/aiffdec.c
libavformat/version.h

index 9bff565..cd916f9 100644 (file)
@@ -337,7 +337,10 @@ static int aiff_read_header(AVFormatContext *s)
     }
 
 got_sound:
-    if (!st->codecpar->block_align) {
+    if (!st->codecpar->block_align && st->codecpar->codec_id == AV_CODEC_ID_QCELP) {
+        av_log(s, AV_LOG_WARNING, "qcelp without wave chunk, assuming full rate\n");
+        st->codecpar->block_align = 35;
+    } else if (!st->codecpar->block_align) {
         av_log(s, AV_LOG_ERROR, "could not find COMM tag or invalid block_align value\n");
         return -1;
     }
index 92801b4..9b40173 100644 (file)
@@ -33,7 +33,7 @@
 // Also please add any ticket numbers that you believe might be affected here
 #define LIBAVFORMAT_VERSION_MAJOR  57
 #define LIBAVFORMAT_VERSION_MINOR  51
-#define LIBAVFORMAT_VERSION_MICRO 103
+#define LIBAVFORMAT_VERSION_MICRO 104
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \