virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'

Browse Source 
* commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d':
  matroskaenc: Allow VP9 and Opus in webm

Conflicts:
	libavformat/matroskaenc.c

See: 820ffaed0f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-06-01 11:57:43 +02:00
parent 181b2c3724 d2ef708c95
commit 754bf1212c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/matroskaenc.c
View File

@@ -769,7 +769,7 @@ static int mkv_write_tracks(AVFormatContext *s)
codec->codec_id == AV_CODEC_ID_VORBIS || codec->codec_id == AV_CODEC_ID_VORBIS ||
codec->codec_id == AV_CODEC_ID_WEBVTT)) { codec->codec_id == AV_CODEC_ID_WEBVTT)) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Only VP8,VP9 video and Vorbis,Opus audio and WebVTT subtitles are supported for WebM.\n"); "Only VP8 or VP9 video and Vorbis or Opus audio and WebVTT subtitles are supported for WebM.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }