diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-05-28 08:44:07 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 19:29:45 +0200 |
| commit | c14045c818674a1212bfb6e451f513ce916b613a (patch) | |
| tree | b3ca90abffb8ee841262e74b9792ba402e3c93c5 | |
| parent | 0f87b42b44f8da7234e8e43b27d1dc5e4dce7582 (diff) | |
| download | ffmpeg-c14045c818674a1212bfb6e451f513ce916b613a.tar.gz | |
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 <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroskaenc.c | 4 |
1 files 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); } |