Merge commit '44a1731011e87fbf4180d026aefb8bfe85d8c7dc'
authorJames Almer <jamrial@gmail.com>
Wed, 28 Mar 2018 18:46:59 +0000 (15:46 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 28 Mar 2018 18:46:59 +0000 (15:46 -0300)
* commit '44a1731011e87fbf4180d026aefb8bfe85d8c7dc':
  ivf: Support VP9 and AV1 as well

See e8f0a463b0d27a4d74c0d9f1857e72a8033d1069

Merged-by: James Almer <jamrial@gmail.com>
libavformat/ivfenc.c

index f591327..af803d5 100644 (file)
@@ -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);
     }