Merge commit 'f9fbd474676e903e12efe83203697d60a9d28cf9'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:15:14 +0000 (18:15 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:15:14 +0000 (18:15 +0000)
commit2814f06abf43455a470e5a509c21c65faa2e53c1
treefa05dd1738a4e75d6b447e55ce72b44c0c2d7fff
parent133aa68601d5dfd148826927b0c154605ec9f01e
parentf9fbd474676e903e12efe83203697d60a9d28cf9
Merge commit 'f9fbd474676e903e12efe83203697d60a9d28cf9'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/Makefile
libavcodec/msmpeg4data.c
libavcodec/msmpeg4data.h
libavcodec/mss2.c
libavcodec/vc1.c
libavcodec/wmv2.c
libavcodec/wmv2data.c
libavcodec/wmv2data.h