From 156fbbb562f36f6dcaf363fb3029834c28519dc7 Mon Sep 17 00:00:00 2001 From: Matthew Gregan Date: Fri, 18 Nov 2016 16:29:42 +1300 Subject: [PATCH] avformat/movenc: Restrict experimental VP9 support to MODE_MP4. Signed-off-by: Matthew Gregan Signed-off-by: James Almer --- libavformat/movenc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index e75a5c57e6..dc19838ed6 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5744,8 +5744,11 @@ static int mov_init(AVFormatContext *s) pix_fmt == AV_PIX_FMT_MONOWHITE || pix_fmt == AV_PIX_FMT_MONOBLACK; } - if (track->mode == MODE_MP4 && - track->par->codec_id == AV_CODEC_ID_VP9) { + if (track->par->codec_id == AV_CODEC_ID_VP9) { + if (track->mode != MODE_MP4) { + av_log(s, AV_LOG_ERROR, "VP9 only supported in MP4.\n"); + return AVERROR(EINVAL); + } if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(s, AV_LOG_ERROR, "VP9 in MP4 support is experimental, add "