summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2018-03-28 15:46:59 -0300
committerJames Almer <jamrial@gmail.com>2018-03-28 15:46:59 -0300
commitcbd5e737fee5e64109fffbc5c2dc05024a06c2c6 (patch)
tree2f298669fe9aef7b23c9e6e8633c97820de58860
parent18195e570cfb83149e5eea203b4b5ee84babd420 (diff)
parent44a1731011e87fbf4180d026aefb8bfe85d8c7dc (diff)
Merge commit '44a1731011e87fbf4180d026aefb8bfe85d8c7dc'
* commit '44a1731011e87fbf4180d026aefb8bfe85d8c7dc': ivf: Support VP9 and AV1 as well See e8f0a463b0d27a4d74c0d9f1857e72a8033d1069 Merged-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavformat/ivfenc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c
index f591327a21..af803d59ee 100644
--- a/libavformat/ivfenc.c
+++ b/libavformat/ivfenc.c
@@ -37,8 +37,9 @@ static int ivf_write_header(AVFormatContext *s)
}
par = s->streams[0]->codecpar;
if (par->codec_type != AVMEDIA_TYPE_VIDEO ||
- !(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_AV1 ||
+ par->codec_id == AV_CODEC_ID_VP8 ||
+ par->codec_id == AV_CODEC_ID_VP9)) {
av_log(s, AV_LOG_ERROR, "Currently only VP8, VP9 and AV1 are supported!\n");
return AVERROR(EINVAL);
}