lavf: Remove experimental flag for Opus in WebM
authorVignesh Venkatasubramanian <vigneshv@google.com>
Wed, 28 May 2014 15:44:07 +0000 (08:44 -0700)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 17:29:45 +0000 (19:29 +0200)
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 <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskaenc.c

index a5c507e..60ea646 100644 (file)
@@ -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);
         }