Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:53:07 +0000 (09:53 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:53:07 +0000 (09:53 +0200)
* commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04':
  webm: Explicitly select libvpx, libopus and libvorbis encoders

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
configure
libavformat/matroskaenc.c

diff --cc 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"
  
@@@ -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,