webm: Explicitly select libvpx, libopus and libvorbis encoders

And update the preference for the newer codecs now that the libraries seem stable and widespread enough. Bug-Id: 695 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years ago · e176639bcb
parent 413d4e54a9
commit e176639bcb
2 changed files with 3 additions and 2 deletions
--- a/1
+++ b/1
@ -2193,6 +2193,7 @@ w64_demuxer_select="wav_demuxer"
 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"
 xmv_demuxer_select="riffdec"
 xwma_demuxer_select="riffdec"
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@ -1790,8 +1790,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,
    .write_header      = mkv_write_header,
    .write_packet      = mkv_write_flush_packet,
    .write_trailer     = mkv_write_trailer,