Commit 61e12875 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3f38d4b8'

* commit '3f38d4b8':
  vp9: Parse subsampling and report missing feature

Conflicts:
	libavcodec/vp9.c
	libavcodec/vp9.h

No change as FFmpeg already supports subsampling
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents b66b1a10 3f38d4b8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment