Commit 3436c4a3 authored by Anton Khirnov's avatar Anton Khirnov

matroskaenc: saner default codecs.

libvorbis/libx264 for video if available, otherwise ac3/mpeg4.
parent b6d28eff
...@@ -1214,8 +1214,16 @@ AVOutputFormat ff_matroska_muxer = { ...@@ -1214,8 +1214,16 @@ AVOutputFormat ff_matroska_muxer = {
.mime_type = "video/x-matroska", .mime_type = "video/x-matroska",
.extensions = "mkv", .extensions = "mkv",
.priv_data_size = sizeof(MatroskaMuxContext), .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, .video_codec = CODEC_ID_MPEG4,
#endif
.write_header = mkv_write_header, .write_header = mkv_write_header,
.write_packet = mkv_write_packet, .write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer, .write_trailer = mkv_write_trailer,
...@@ -1249,7 +1257,11 @@ AVOutputFormat ff_matroska_audio_muxer = { ...@@ -1249,7 +1257,11 @@ AVOutputFormat ff_matroska_audio_muxer = {
.mime_type = "audio/x-matroska", .mime_type = "audio/x-matroska",
.extensions = "mka", .extensions = "mka",
.priv_data_size = sizeof(MatroskaMuxContext), .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, .video_codec = CODEC_ID_NONE,
.write_header = mkv_write_header, .write_header = mkv_write_header,
.write_packet = mkv_write_packet, .write_packet = mkv_write_packet,
......
...@@ -103,7 +103,7 @@ do_lavf nut "-acodec mp2" ...@@ -103,7 +103,7 @@ do_lavf nut "-acodec mp2"
fi fi
if [ -n "$do_mkv" ] ; then if [ -n "$do_mkv" ] ; then
do_lavf mkv do_lavf mkv "-c:a mp2 -c:v mpeg4"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment