matroskaenc: Allow VP9 and Opus in webm

Bug-Id: 695

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

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index f6af0f832493e13ac4255361384e452e6d1bdbb0..919cdfd722a8fea111ecad06390c39f25d59a20f 100644 (file)
--- 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);
         }