diff options
| author | Tudor Suciu <tudor.suciu@gmail.com> | 2013-06-02 17:49:24 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-06-01 07:50:00 +0200 |
| commit | d2ef708c95ace2518deffe830a9c439aeb9edd5d (patch) | |
| tree | 4083f27403bab8022563ee13f4a84dcba1340b6b | |
| parent | f797b134cad4d248b1c8955659997980d0668bc3 (diff) | |
| download | ffmpeg-d2ef708c95ace2518deffe830a9c439aeb9edd5d.tar.gz | |
matroskaenc: Allow VP9 and Opus in webm
Bug-Id: 695
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -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 f6af0f8324..919cdfd722 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -670,9 +670,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->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 or VP9 video and Vorbis or Opus audio are supported for WebM.\n"); return AVERROR(EINVAL); } |