diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-10-11 09:52:34 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-10-11 09:52:34 +0200 |
| commit | 34aa14546853c4f56c1cf0195707028d5f59a2f5 (patch) | |
| tree | 51cd8667854ff7c682e9d797b2b5b2e55693fca7 /libavformat | |
| parent | 4147d8efe5cc39d18b744a866e0cddd1978a4d00 (diff) | |
| download | ffmpeg-34aa14546853c4f56c1cf0195707028d5f59a2f5.tar.gz | |
lavf/aiffenc: Write extradata also for qcelp.
Fixes ticket #4009.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/aiffenc.c | 3 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index d876997f9b..74b778bbcb 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -185,7 +185,8 @@ static int aiff_write_header(AVFormatContext *s) avio_wb16(pb, 0); } - if (par->codec_tag == MKTAG('Q','D','M','2') && par->extradata_size) { + if ( (par->codec_tag == MKTAG('Q','D','M','2') + || par->codec_tag == MKTAG('Q','c','l','p')) && par->extradata_size) { ffio_wfourcc(pb, "wave"); avio_wb32(pb, par->extradata_size); avio_write(pb, par->extradata, par->extradata_size); diff --git a/libavformat/version.h b/libavformat/version.h index 9b401739cf..1ac73921cf 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -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 104 +#define LIBAVFORMAT_VERSION_MICRO 105 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |