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>
configure
libavformat/matroskaenc.c

index 6449018..2f3f5e4 100755 (executable)
--- a/configure
+++ b/configure
@@ -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"
index 4eb687f..2b2d034 100644 (file)
@@ -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,