Merge commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:23:36 +0000 (18:23 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 18:23:36 +0000 (18:23 +0000)
* commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9':
  build: Disentangle VC-1 decoder and parser

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
configure
libavcodec/Makefile

diff --cc configure
+++ b/configure
@@@ -2600,8 -2159,8 +2600,8 @@@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hw
  h264_parser_select="h264_decoder"
  hevc_parser_select="golomb"
  mpegvideo_parser_select="mpegvideo"
 -mpeg4video_parser_select="error_resilience h263dsp mpegvideo qpeldsp"
 +mpeg4video_parser_select="h263dsp mpegvideo qpeldsp"
- vc1_parser_select="mpegvideo startcode vc1_decoder"
+ vc1_parser_select="vc1dsp"
  
  # bitstream_filters
  mjpeg2jpeg_bsf_select="jpegtables"
@@@ -888,10 -732,10 +888,11 @@@ OBJS-$(CONFIG_PNM_PARSER)              
  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
  
  # bitstream filters
  OBJS-$(CONFIG_AAC_ADTSTOASC_BSF)          += aac_adtstoasc_bsf.o aacadtsdec.o \