Commit 4147d8ef authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavf/aiffdec: Default to full rate qcelp as QT does.

Fixes decoding of the output file from ticket #4009.
parent d0c1b982
...@@ -337,7 +337,10 @@ static int aiff_read_header(AVFormatContext *s) ...@@ -337,7 +337,10 @@ static int aiff_read_header(AVFormatContext *s)
} }
got_sound: 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"); av_log(s, AV_LOG_ERROR, "could not find COMM tag or invalid block_align value\n");
return -1; return -1;
} }
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here // Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 51 #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, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment