Merge commit '44a1731011e87fbf4180d026aefb8bfe85d8c7dc'

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

See e8f0a463b0

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-03-28 15:46:59 -03:00
commit cbd5e737fe

View 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);
}