aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/ivfenc.c
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-07-02 20:28:39 -0700
committerMichael Niedermayer <michaelni@gmx.at>2014-07-03 15:46:26 +0200
commitdea377fcc0cbb2ffe4b1be860d2e207da28b098a (patch)
treeb970a5c860cd38c328ff476ddb10b7f166ed7bc9 /libavformat/ivfenc.c
parent4582e1162a0b57bd0787da390555b8f96f8b393b (diff)
downloadffmpeg-dea377fcc0cbb2ffe4b1be860d2e207da28b098a.tar.gz
ivfenc: support VP9
libvpx tools accept vp9 ivf files Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ivfenc.c')
-rw-r--r--libavformat/ivfenc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c
index 45bae22097..5700f01d3c 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);