Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04'

* commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04': webm: Explicitly select libvpx, libopus and libvorbis encoders Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
10 years ago · f5258a7d16
parent ebff705c2c e176639bcb
commit f5258a7d16
2 changed files with 3 additions and 2 deletions
--- a/1
+++ b/1
@ -2630,6 +2630,7 @@ w64_muxer_select="wav_muxer"
 wav_demuxer_select="riffdec"
 wav_muxer_select="riffenc"
 webm_muxer_select="riffenc"
+webm_muxer_suggest="libopus_encoder libvorbis_encoder libvpx_vp8_encoder libvpx_vp9_encoder"
 wtv_demuxer_select="riffdec"
 wtv_muxer_select="riffenc"
 xmv_demuxer_select="riffdec"
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@ -2190,8 +2190,8 @@ AVOutputFormat ff_webm_muxer = {
    .mime_type         = "video/webm",
    .extensions        = "webm",
    .priv_data_size    = sizeof(MatroskaMuxContext),
-    .audio_codec       = AV_CODEC_ID_VORBIS,
-    .video_codec       = AV_CODEC_ID_VP8,
+    .audio_codec       = CONFIG_LIBOPUS_ENCODER ? AV_CODEC_ID_OPUS : AV_CODEC_ID_VORBIS,
+    .video_codec       = CONFIG_LIBVPX_VP9_ENCODER? AV_CODEC_ID_VP9 : AV_CODEC_ID_VP8,
    .subtitle_codec    = AV_CODEC_ID_WEBVTT,
    .write_header      = mkv_write_header,
    .write_packet      = mkv_write_flush_packet,