diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 11:57:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 12:00:20 +0200 |
| commit | 754bf1212c5a256737a04a8f0d3bb83d1b615d8c (patch) | |
| tree | 09c7d84ec46e37f2bfbb56fe33bb1e42d07492a3 | |
| parent | 181b2c37249c60033071b2744da4941a5f8ec0d3 (diff) | |
| parent | d2ef708c95ace2518deffe830a9c439aeb9edd5d (diff) | |
| download | ffmpeg-754bf1212c5a256737a04a8f0d3bb83d1b615d8c.tar.gz | |
Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'
* commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d':
matroskaenc: Allow VP9 and Opus in webm
Conflicts:
libavformat/matroskaenc.c
See: 820ffaed0f64b7ec27275d093c6f81e181c86e94
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroskaenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index b2db43cb1e..fb26d9535b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -769,7 +769,7 @@ static int mkv_write_tracks(AVFormatContext *s) 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 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); } |