Merge commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 19:10:51 +0000 (20:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Mar 2014 19:10:51 +0000 (20:10 +0100)
* commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7':
  arm: build: Maintain decoder objects separate from infrastructure objects

Conflicts:
libavcodec/arm/Makefile

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

@@@ -28,7 -27,7 +27,8 @@@ OBJS-$(CONFIG_AAC_DECODER)             
  OBJS-$(CONFIG_DCA_DECODER)             += arm/dcadsp_init_arm.o
  OBJS-$(CONFIG_FLAC_DECODER)            += arm/flacdsp_init_arm.o        \
                                            arm/flacdsp_arm.o
 +OBJS-$(CONFIG_FLAC_ENCODER)            += arm/flacdsp_init_arm.o
+ OBJS-$(CONFIG_MLP_DECODER)             += arm/mlpdsp_init_arm.o
  OBJS-$(CONFIG_VC1_DECODER)             += arm/vc1dsp_init_arm.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += arm/vorbisdsp_init_arm.o
  OBJS-$(CONFIG_VP6_DECODER)             += arm/vp6dsp_init_arm.o