Merge commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9'

* commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9': build: Disentangle VC-1 decoder and parser Merged-by: Derek Buitenhuis <[email protected]>
SaschaVasarrhelyi · Feb 24, 2016 · ef7ce48 · ef7ce48
2 parents b056482 + d24bd96
commit ef7ce48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/configure b/configure
@@ -2601,7 +2601,7 @@ h264_parser_select="h264_decoder"
 hevc_parser_select="golomb"
 mpegvideo_parser_select="mpegvideo"
 mpeg4video_parser_select="h263dsp mpegvideo qpeldsp"
-vc1_parser_select="mpegvideo startcode vc1_decoder"
+vc1_parser_select="vc1dsp"
 
 # bitstream_filters
 mjpeg2jpeg_bsf_select="jpegtables"

diff --git 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