[FFmpeg-cvslog] Merge commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 22:30:04 2014 +0100| [7a69ffaf0df4e71837f0d2c2115d73fa3c95dcc6] | committer: Michael Niedermayer

Merge commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919'

* commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919':
  riff: add VP9 fourcc

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a69ffaf0df4e71837f0d2c2115d73fa3c95dcc6
---