[FFmpeg-cvslog] lavf/matroska: Allow AV1 in WebM

[Kagami Hiiragi]

ffmpeg | branch: master | Kagami Hiiragi <kagami at genshiken.org> | Mon Aug 20 19:44:40 2018 +0300| [cbe5c7ef386d7bc211823a9bdb17d41d97d4fb71] | committer: James Almer

lavf/matroska: Allow AV1 in WebM

Nothing prevents it to work except this check. AV1 is already supported
by Matroska muxer and aomenc produces WebM/AV1 files as well.

Signed-off-by: Kagami Hiiragi <kagami at genshiken.org>
Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavformat/matroskaenc.c | 3 ++-
 libavformat/version.h     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 09a62e1922..76cb124221 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1296,11 +1296,12 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
 
     if (mkv->mode == MODE_WEBM && !(par->codec_id == AV_CODEC_ID_VP8 ||
                                     par->codec_id == AV_CODEC_ID_VP9 ||
+                                    par->codec_id == AV_CODEC_ID_AV1 ||
                                     par->codec_id == AV_CODEC_ID_OPUS ||
                                     par->codec_id == AV_CODEC_ID_VORBIS ||
                                     par->codec_id == AV_CODEC_ID_WEBVTT)) {
         av_log(s, AV_LOG_ERROR,
-               "Only VP8 or VP9 video and Vorbis or Opus audio and WebVTT subtitles are supported for WebM.\n");
+               "Only VP8 or VP9 or AV1 video and Vorbis or Opus audio and WebVTT subtitles are supported for WebM.\n");
         return AVERROR(EINVAL);
     }
 
diff --git a/libavformat/version.h b/libavformat/version.h
index d7a1a35069..b346bc3bcd 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -33,7 +33,7 @@
 // Also please add any ticket numbers that you believe might be affected here
 #define LIBAVFORMAT_VERSION_MAJOR  58
 #define LIBAVFORMAT_VERSION_MINOR  18
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MICRO 102
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \