[FFmpeg-cvslog] lavf/aiffenc: Write extradata also for qcelp.

Carl Eugen Hoyos git at videolan.org
Tue Oct 11 11:03:13 EEST 2016


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Oct 11 09:52:34 2016 +0200| [34aa14546853c4f56c1cf0195707028d5f59a2f5] | committer: Carl Eugen Hoyos

lavf/aiffenc: Write extradata also for qcelp.

Fixes ticket #4009.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34aa14546853c4f56c1cf0195707028d5f59a2f5
---

 libavformat/aiffenc.c | 3 ++-
 libavformat/version.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index d876997..74b778b 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 9b40173..1ac7392 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, \



More information about the ffmpeg-cvslog mailing list