summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Gregan <kinetik@flim.org>2016-11-18 16:29:42 +1300
committerJames Almer <jamrial@gmail.com>2016-11-21 16:07:14 -0300
commit156fbbb562f36f6dcaf363fb3029834c28519dc7 (patch)
tree2e333d4308a8a265cdd1b3ec49fc7246a13705bb
parent2d73d25670ced04a7ef7e0936e340292816ef7db (diff)
avformat/movenc: Restrict experimental VP9 support to MODE_MP4.
Signed-off-by: Matthew Gregan <kinetik@flim.org> Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavformat/movenc.c7
1 files 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 "