From c14045c818674a1212bfb6e451f513ce916b613a Mon Sep 17 00:00:00 2001 From: Vignesh Venkatasubramanian Date: Wed, 28 May 2014 08:44:07 -0700 Subject: [PATCH] lavf: Remove experimental flag for Opus in WebM Opus in WebM is no more experimental as we have everything necessary in the container writing code as per the spec. So removing the experimental flag. Note that we removed the experimental suffix from the CodecId field long ago ( http://goo.gl/O0TYRB ). Signed-off-by: Vignesh Venkatasubramanian Signed-off-by: Michael Niedermayer --- libavformat/matroskaenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a5c507eefe..60ea64657b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -761,11 +761,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_OPUS || codec->codec_id == AV_CODEC_ID_VORBIS || codec->codec_id == AV_CODEC_ID_WEBVTT)) { av_log(s, AV_LOG_ERROR, - "Only VP8,VP9 video and Vorbis,Opus(experimental, use -strict -2) audio and WebVTT subtitles are supported for WebM.\n"); + "Only VP8,VP9 video and Vorbis,Opus audio and WebVTT subtitles are supported for WebM.\n"); return AVERROR(EINVAL); }