diff options
| author | Kagami Hiiragi <kagami@genshiken.org> | 2018-08-20 19:44:40 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-09-21 12:20:48 -0300 |
| commit | cbe5c7ef386d7bc211823a9bdb17d41d97d4fb71 (patch) | |
| tree | 801292a2851c854e4519e202b74e313bc018c68b | |
| parent | 1cb101f60d3b432355e548b1c8a8c9448686dc9f (diff) | |
| download | ffmpeg-cbe5c7ef386d7bc211823a9bdb17d41d97d4fb71.tar.gz | |
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@genshiken.org>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/matroskaenc.c | 3 | ||||
| -rw-r--r-- | 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, \ |