[FFmpeg-cvslog] Merge commit '44a1731011e87fbf4180d026aefb8bfe85d8c7dc'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Mar 28 15:46:59 2018 -0300| [cbd5e737fee5e64109fffbc5c2dc05024a06c2c6] | committer: James Almer

Merge commit '44a1731011e87fbf4180d026aefb8bfe85d8c7dc'

* commit '44a1731011e87fbf4180d026aefb8bfe85d8c7dc':
  ivf: Support VP9 and AV1 as well

See e8f0a463b0d27a4d74c0d9f1857e72a8033d1069

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cbd5e737fee5e64109fffbc5c2dc05024a06c2c6
---

 libavformat/ivfenc.c | 5 +++--
 1 file 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);
     }


======================================================================

diff --cc libavformat/ivfenc.c
index f591327a21,48186a8907..af803d59ee
--- a/libavformat/ivfenc.c
+++ b/libavformat/ivfenc.c
@@@ -37,9 -32,10 +37,10 @@@ static int ivf_write_header(AVFormatCon
      }
      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 AV1, VP8 and VP9 are supported!\n");
 +        av_log(s, AV_LOG_ERROR, "Currently only VP8, VP9 and AV1 are supported!\n");
          return AVERROR(EINVAL);
      }
      avio_write(pb, "DKIF", 4);