Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04'

* commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04':
  webm: Explicitly select libvpx, libopus and libvorbis encoders

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc configure
index 6449018516660325bab4990182cf2fb28382e8ff,c3c4f8219170e4933f4b0ad8318d2932c9f65a9e..2f3f5e4045951c6fd16ffbd70a5439f4cd410c6e
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2630,8 -2193,8 +2630,9 @@@ 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"
  xwma_demuxer_select="riffdec"
  

diff --cc libavformat/matroskaenc.c
index 4eb687f86e41e4778bc03a77b02fe9a7d8db081e,498f479a77155f0ea65cb389598b366cf8d42b11..2b2d034e00c81db23f3d63dda6ac495c8f6afb35
--- 1/libavformat/matroskaenc.c
--- 2/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@@ -2190,9 -1790,8 +2190,9 @@@ 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,
      .write_trailer     = mkv_write_trailer,