diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-03-01 23:22:40 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-03-05 14:41:01 +0100 |
| commit | 1638d956a35c240e4f9ad2d8711dce06bd32838a (patch) | |
| tree | 36ced4203abfceb3c4eb3cc8943dd6d62f2c95c9 | |
| parent | ba150051322c02e24c004bd5309468886e1e5ab6 (diff) | |
| download | ffmpeg-1638d956a35c240e4f9ad2d8711dce06bd32838a.tar.gz | |
lavf/matroska: Support QDMC.
| -rw-r--r-- | libavformat/matroska.c | 1 | ||||
| -rw-r--r-- | libavformat/matroskaenc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 7905fd1ff7..6af667c36b 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -48,6 +48,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_S24LE}, {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_S32LE}, {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_U8}, + {"A_QUICKTIME/QDMC" , AV_CODEC_ID_QDMC}, {"A_QUICKTIME/QDM2" , AV_CODEC_ID_QDM2}, {"A_REAL/14_4" , AV_CODEC_ID_RA_144}, {"A_REAL/28_8" , AV_CODEC_ID_RA_288}, diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1622b44e5e..1605f0cafe 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2528,6 +2528,7 @@ static const AVCodecTag additional_audio_tags[] = { { AV_CODEC_ID_PCM_S16BE, 0xFFFFFFFF }, { AV_CODEC_ID_PCM_S24BE, 0xFFFFFFFF }, { AV_CODEC_ID_PCM_S32BE, 0xFFFFFFFF }, + { AV_CODEC_ID_QDMC, 0xFFFFFFFF }, { AV_CODEC_ID_QDM2, 0xFFFFFFFF }, { AV_CODEC_ID_RA_144, 0xFFFFFFFF }, { AV_CODEC_ID_RA_288, 0xFFFFFFFF }, |