diff options
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index aa767f3535..ce1a7d1d3f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -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, |