diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 18:15:14 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 18:15:14 +0000 |
| commit | 2814f06abf43455a470e5a509c21c65faa2e53c1 (patch) | |
| tree | fa05dd1738a4e75d6b447e55ce72b44c0c2d7fff /libavcodec/mss2.c | |
| parent | 133aa68601d5dfd148826927b0c154605ec9f01e (diff) | |
| parent | f9fbd474676e903e12efe83203697d60a9d28cf9 (diff) | |
| download | ffmpeg-2814f06abf43455a470e5a509c21c65faa2e53c1.tar.gz | |
Merge commit 'f9fbd474676e903e12efe83203697d60a9d28cf9'
* commit 'f9fbd474676e903e12efe83203697d60a9d28cf9':
msmpeg4data: Move WMV2 data tables to their own file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/mss2.c')
| -rw-r--r-- | libavcodec/mss2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index c640934986..d255dd4337 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -28,9 +28,9 @@ #include "internal.h" #include "mpeg_er.h" #include "msmpeg4.h" -#include "msmpeg4data.h" #include "qpeldsp.h" #include "vc1.h" +#include "wmv2data.h" #include "mss12.h" #include "mss2dsp.h" |