diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 18:23:36 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 18:23:36 +0000 |
| commit | ef7ce480c848267a77bd89666b9b22b2298c181d (patch) | |
| tree | 4f6ce78291e0b493bb4452cc2f948cf5cc2815b5 /libavcodec | |
| parent | b056482ef36192abb709ae0dcf09178895397d89 (diff) | |
| parent | d24bd96bdd5b4bae9a9e0055fa8d1104db1283a9 (diff) | |
| download | ffmpeg-ef7ce480c848267a77bd89666b9b22b2298c181d.tar.gz | |
Merge commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9'
* commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9':
build: Disentangle VC-1 decoder and parser
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c55ecdd772..f78d27b038 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -888,7 +888,8 @@ OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o -OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o wmv2data.o +OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o \ + simple_idct.o wmv2data.o OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o OBJS-$(CONFIG_VP8_PARSER) += vp8_parser.o OBJS-$(CONFIG_VP9_PARSER) += vp9_parser.o |