Browse Source

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

Fixes decoding of the output file from ticket #4009.
tags/n3.2
Carl Eugen Hoyos 9 years ago
parent
commit
4147d8efe5
2 changed files with 5 additions and 2 deletions
  1. +4
    -1
      libavformat/aiffdec.c
  2. +1
    -1
      libavformat/version.h

+ 4
- 1
libavformat/aiffdec.c View 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;
}


+ 1
- 1
libavformat/version.h View 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, \


Loading…
Cancel
Save