From 820ffaed0f64b7ec27275d093c6f81e181c86e94 Mon Sep 17 00:00:00 2001 From: Tudor Suciu Date: Sun, 2 Jun 2013 17:49:24 +0200 Subject: [PATCH] avformat/matroskaenc: Allow VP9 and Opus in webm Signed-off-by: Michael Niedermayer --- libavformat/matroskaenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f34813c8b2a..dfbb174981b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -619,9 +619,11 @@ static int mkv_write_tracks(AVFormatContext *s) } if (mkv->mode == MODE_WEBM && !(codec->codec_id == AV_CODEC_ID_VP8 || + codec->codec_id == AV_CODEC_ID_VP9 || + ((codec->codec_id == AV_CODEC_ID_OPUS)&&(codec->strict_std_compliance <= FF_COMPLIANCE_EXPERIMENTAL)) || codec->codec_id == AV_CODEC_ID_VORBIS)) { av_log(s, AV_LOG_ERROR, - "Only VP8 video and Vorbis audio are supported for WebM.\n"); + "Only VP8,VP9 video and Vorbis,Opus(experimental, use -strict -2) audio are supported for WebM.\n"); return AVERROR(EINVAL); } -- 2.39.2