diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2015-08-09 10:59:33 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-08-25 19:47:43 +0200 |
| commit | e176639bcbf4b580edb462a6b0650e53cd5e3c04 (patch) | |
| tree | b278717b0a6dc27b172d68320948c9611ea52cc5 | |
| parent | 413d4e54a9bffe2d0afdc6d8a80f516e5df6a421 (diff) | |
| download | ffmpeg-e176639bcbf4b580edb462a6b0650e53cd5e3c04.tar.gz | |
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>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavformat/matroskaenc.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -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 b1c0020edd..498f479a77 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, |