RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/matroskaenc: Allow VP9 and Opus in webm 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Tudor Suciu 2013-06-02 17:49:24 +02:00 committed by Michael Niedermayer
parent c3316ddb83
commit 820ffaed0f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/matroskaenc.c
View File

@ -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);
}