RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

matroskaenc: add codec_tag lists back. 

This reverts 312645e :
"Do not set codec_tag property for matroska muxers."

Also adds dummy codec_tag lists with codecs
supported in mkv but not in wav / avi.

Fixes ticket #2169.
(cherry picked from commit df39c3ce38)

Conflicts:
	libavformat/matroskaenc.c
This commit is contained in:
Carl Eugen Hoyos 2013-01-24 02:30:40 +01:00
parent 74b04e6a35
commit 4e869e7a5f
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/matroska.c
View File

@ -21,6 +21,9 @@
#include "matroska.h"
/* If you add a tag here that is not in ff_codec_bmp_tags[]
or ff_codec_wav_tags[], add it also to additional_audio_tags[]
or additional_video_tags[] in matroskaenc.c */
const CodecTags ff_mkv_codec_tags[]={
{"A_AAC" , CODEC_ID_AAC},
{"A_AC3" , CODEC_ID_AC3},

33
libavformat/matroskaenc.c
View File

@ -1295,6 +1295,32 @@ static int mkv_query_codec(enum CodecID codec_id, int std_compliance)
return 0;
}
const AVCodecTag additional_audio_tags[] = {
{ CODEC_ID_ALAC, 0XFFFFFFFF },
{ CODEC_ID_EAC3, 0XFFFFFFFF },
{ CODEC_ID_MLP, 0xFFFFFFFF },
{ CODEC_ID_PCM_S16BE, 0xFFFFFFFF },
{ CODEC_ID_PCM_S24BE, 0xFFFFFFFF },
{ CODEC_ID_PCM_S32BE, 0xFFFFFFFF },
{ CODEC_ID_QDM2, 0xFFFFFFFF },
{ CODEC_ID_RA_144, 0xFFFFFFFF },
{ CODEC_ID_RA_288, 0xFFFFFFFF },
{ CODEC_ID_COOK, 0xFFFFFFFF },
{ CODEC_ID_TRUEHD, 0xFFFFFFFF },
{ CODEC_ID_TTA, 0xFFFFFFFF },
{ CODEC_ID_WAVPACK, 0xFFFFFFFF },
{ CODEC_ID_NONE, 0xFFFFFFFF }
};
const AVCodecTag additional_video_tags[] = {
{ CODEC_ID_PRORES, 0xFFFFFFFF },
{ CODEC_ID_RV10, 0xFFFFFFFF },
{ CODEC_ID_RV20, 0xFFFFFFFF },
{ CODEC_ID_RV30, 0xFFFFFFFF },
{ CODEC_ID_RV40, 0xFFFFFFFF },
{ CODEC_ID_NONE, 0xFFFFFFFF }
};
#if CONFIG_MATROSKA_MUXER
AVOutputFormat ff_matroska_muxer = {
.name = "matroska",
@ -1316,6 +1342,10 @@ AVOutputFormat ff_matroska_muxer = {
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag* const []){
ff_codec_bmp_tags, ff_codec_wav_tags,
additional_audio_tags, additional_video_tags, 0
},
.subtitle_codec = CODEC_ID_SSA,
.query_codec = mkv_query_codec,
};
@ -1354,5 +1384,8 @@ AVOutputFormat ff_matroska_audio_muxer = {
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){
ff_codec_wav_tags, additional_audio_tags, 0
},
};
#endif