diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-27 09:53:07 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-27 09:53:07 +0200 |
| commit | f5258a7d16d01ddce0913b110a5d407d460c3906 (patch) | |
| tree | 991f2d0ac36f6fa0f41dce1123de47983b45c866 | |
| parent | ebff705c2c5521134927de3ef94ab92ed0197f1d (diff) | |
| parent | e176639bcbf4b580edb462a6b0650e53cd5e3c04 (diff) | |
| download | ffmpeg-f5258a7d16d01ddce0913b110a5d407d460c3906.tar.gz | |
Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04'
* commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04':
webm: Explicitly select libvpx, libopus and libvorbis encoders
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavformat/matroskaenc.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -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" diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 4eb687f86e..2b2d034e00 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -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, |