diff options
| author | Tudor Suciu <tudor.suciu@gmail.com> | 2013-06-02 17:49:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 00:10:50 +0200 |
| commit | 820ffaed0f64b7ec27275d093c6f81e181c86e94 (patch) | |
| tree | c1c90ccf4c253bc1dfcd1b908da678122d9d1440 /libavformat/matroskaenc.c | |
| parent | c3316ddb83e7d88dcac5500d4d6625fb28d5450b (diff) | |
| download | ffmpeg-820ffaed0f64b7ec27275d093c6f81e181c86e94.tar.gz | |
avformat/matroskaenc: Allow VP9 and Opus in webm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f34813c8b2..dfbb174981 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); } |