mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
Merge commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c'
* commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c': vp9: Parse subsampling and report missing feature Conflicts: libavcodec/vp9.c libavcodec/vp9.h No change as FFmpeg already supports subsampling Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
61e1287551