[FFmpeg-cvslog] matroskaenc: Allow VP9 and Opus in webm

[Tudor Suciu]

ffmpeg | branch: master | Tudor Suciu <tudor.suciu at gmail.com> | Sun Jun  2 17:49:24 2013 +0200| [d2ef708c95ace2518deffe830a9c439aeb9edd5d] | committer: Anton Khirnov

matroskaenc: Allow VP9 and Opus in webm

Bug-Id: 695

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2ef708c95ace2518deffe830a9c439aeb9edd5d
---

 libavformat/matroskaenc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index f6af0f8..919cdfd 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);
         }