[FFmpeg-cvslog] Merge commit 'f9fbd474676e903e12efe83203697d60a9d28cf9'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb 24 18:15:14 2016 +0000| [2814f06abf43455a470e5a509c21c65faa2e53c1] | committer: Derek Buitenhuis

Merge commit 'f9fbd474676e903e12efe83203697d60a9d28cf9'

* commit 'f9fbd474676e903e12efe83203697d60a9d28cf9':
  msmpeg4data: Move WMV2 data tables to their own file

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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