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>

diff --cc libavformat/matroskaenc.c
index b2db43cb1e71857f3c14ff24c2b9629759c1e9ff,919cdfd722a8fea111ecad06390c39f25d59a20f..fb26d9535bc49441d61daf35d85ad39fd151891e
--- 1/libavformat/matroskaenc.c
--- 2/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@@ -766,10 -672,9 +766,10 @@@ static int mkv_write_tracks(AVFormatCon
          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)) {
 +                                        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 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);
          }