Merge commit '3f38d4b816b2aeca15c0b90000ea7ed40377eb0c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 22:24:45 +0000 (00:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 22:24:45 +0000 (00:24 +0200)
* 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>

Trivial merge