Merge commit 'dc4d726bab59f349d366916ba01df16289e5c81f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 19:05:18 +0000 (20:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 19:05:18 +0000 (20:05 +0100)
* commit 'dc4d726bab59f349d366916ba01df16289e5c81f':
  build: Add separate hidden config option for the intrax8 code

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/Makefile

diff --cc configure
Simple merge
@@@ -460,8 -377,7 +461,8 @@@ OBJS-$(CONFIG_V210X_DECODER)           
  OBJS-$(CONFIG_VB_DECODER)              += vb.o
  OBJS-$(CONFIG_VBLE_DECODER)            += vble.o
  OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1.o vc1data.o vc1dsp.o \
 -                                          msmpeg4dec.o msmpeg4.o msmpeg4data.o
 +                                          msmpeg4dec.o msmpeg4.o msmpeg4data.o \
-                                           intrax8.o intrax8dsp.o wmv2dsp.o
++                                          wmv2dsp.o
  OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
  OBJS-$(CONFIG_VMDAUDIO_DECODER)        += vmdav.o
  OBJS-$(CONFIG_VMDVIDEO_DECODER)        += vmdav.o