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

matroskaenc: saner default codecs. 

libvorbis/libx264 for video if available, otherwise ac3/mpeg4.
This commit is contained in:
Anton Khirnov 2011-08-20 16:02:22 +02:00
parent b6d28eff84
commit 3436c4a368
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/matroskaenc.c
View File

@ -1214,8 +1214,16 @@ AVOutputFormat ff_matroska_muxer = {
.mime_type = "video/x-matroska",
.extensions = "mkv",
.priv_data_size = sizeof(MatroskaMuxContext),
.audio_codec = CODEC_ID_MP2,
#if CONFIG_LIBVORBIS_ENCODER
.audio_codec = CODEC_ID_VORBIS,
#else
.audio_codec = CODEC_ID_AC3,
#endif
#if CONFIG_LIBX264_ENCODER
.video_codec = CODEC_ID_H264,
#else
.video_codec = CODEC_ID_MPEG4,
#endif
.write_header = mkv_write_header,
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
@ -1249,7 +1257,11 @@ AVOutputFormat ff_matroska_audio_muxer = {
.mime_type = "audio/x-matroska",
.extensions = "mka",
.priv_data_size = sizeof(MatroskaMuxContext),
.audio_codec = CODEC_ID_MP2,
#if CONFIG_LIBVORBIS_ENCODER
.audio_codec = CODEC_ID_VORBIS,
#else
.audio_codec = CODEC_ID_AC3,
#endif
.video_codec = CODEC_ID_NONE,
.write_header = mkv_write_header,
.write_packet = mkv_write_packet,

2
tests/lavf-regression.sh
View File

@ -103,7 +103,7 @@ do_lavf nut "-acodec mp2"
fi
if [ -n "$do_mkv" ] ; then
do_lavf mkv
do_lavf mkv "-c:a mp2 -c:v mpeg4"
fi