[FFmpeg-cvslog] ivfenc: support VP9

[James Zern]

ffmpeg | branch: master | James Zern <jzern at google.com> | Wed Jul  2 20:28:39 2014 -0700| [dea377fcc0cbb2ffe4b1be860d2e207da28b098a] | committer: Michael Niedermayer

ivfenc: support VP9

libvpx tools accept vp9 ivf files

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/ivfenc.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c
index 45bae22..5700f01 100644
--- a/libavformat/ivfenc.c
+++ b/libavformat/ivfenc.c
@@ -30,8 +30,9 @@ static int ivf_write_header(AVFormatContext *s)
         return AVERROR(EINVAL);
     }
     ctx = s->streams[0]->codec;
-    if (ctx->codec_type != AVMEDIA_TYPE_VIDEO || ctx->codec_id != AV_CODEC_ID_VP8) {
-        av_log(s, AV_LOG_ERROR, "Currently only VP8 is supported!\n");
+    if (ctx->codec_type != AVMEDIA_TYPE_VIDEO ||
+        !(ctx->codec_id == AV_CODEC_ID_VP8 || ctx->codec_id == AV_CODEC_ID_VP9)) {
+        av_log(s, AV_LOG_ERROR, "Currently only VP8 and VP9 are supported!\n");
         return AVERROR(EINVAL);
     }
     avio_write(pb, "DKIF", 4);