Merge commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:30:04 +0000 (22:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:30:58 +0000 (22:30 +0100)
* commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919':
  riff: add VP9 fourcc

See: eb7f7b797f0ae76a7cf6db7792365998ee6e9cba
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge