From e176639bcbf4b580edb462a6b0650e53cd5e3c04 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Sun, 9 Aug 2015 10:59:33 +0200
Subject: [PATCH] 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>
---
configure | 1 +
libavformat/matroskaenc.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 13344802660..c3c4f821917 100755
--- a/configure
+++ b/configure
@@ -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"
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index b1c0020edd4..498f479a771 100644
--- 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,
--
GitLab