Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'

* commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18':
  build: Group general components separate from de/encoders in arch Makefiles

Conflicts:
	libavcodec/arm/Makefile
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/arm/Makefile
index a8446b2538105d553455d9243a5b6850a14fdc11,a439307afef6fc294ef3a011ec51258c47bdac92..ed302e65c02c43dea8409516ef8ce2c685b0e0d0
--- 1/libavcodec/arm/Makefile
--- 2/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@@ -25,9 -19,16 +19,17 @@@ OBJS-$(CONFIG_HPELDSP)                 
  OBJS-$(CONFIG_MPEGAUDIODSP)            += arm/mpegaudiodsp_init_arm.o
  OBJS-$(CONFIG_MPEGVIDEO)               += arm/mpegvideo_arm.o
  OBJS-$(CONFIG_NEON_CLOBBER_TEST)       += arm/neontest.o
+ OBJS-$(CONFIG_VIDEODSP)                += arm/videodsp_init_arm.o
+ OBJS-$(CONFIG_VP3DSP)                  += arm/vp3dsp_init_arm.o
+ 
+ OBJS-$(CONFIG_AAC_DECODER)             += arm/aacpsdsp_init_arm.o       \
+                                           arm/sbrdsp_init_arm.o
+ 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_VC1_DECODER)             += arm/vc1dsp_init_arm.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += arm/vorbisdsp_init_arm.o
- OBJS-$(CONFIG_VP3DSP)                  += arm/vp3dsp_init_arm.o
  OBJS-$(CONFIG_VP6_DECODER)             += arm/vp6dsp_init_arm.o
  OBJS-$(CONFIG_VP8_DECODER)             += arm/vp8dsp_init_arm.o
  OBJS-$(CONFIG_RV30_DECODER)            += arm/rv34dsp_init_arm.o

diff --cc libavcodec/x86/Makefile
index 0d3594f7c4a3be2fbc78e4171deb5d02d9f640bd,24bf96b29b3ae12b74a04c1d89cf592e46f48c80..2262e76e1deeb5d13ab1f9d735e98b7275867ce3
--- 1/libavcodec/x86/Makefile
--- 2/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@@ -21,30 -15,30 +17,35 @@@ OBJS-$(CONFIG_H264DSP)                 
  OBJS-$(CONFIG_H264PRED)                += x86/h264_intrapred_init.o
  OBJS-$(CONFIG_H264QPEL)                += x86/h264_qpel.o
  OBJS-$(CONFIG_HPELDSP)                 += x86/hpeldsp_init.o
 +OBJS-$(CONFIG_LLVIDDSP)                += x86/lossless_videodsp_init.o
  OBJS-$(CONFIG_LPC)                     += x86/lpc.o
- OBJS-$(CONFIG_MLP_DECODER)             += x86/mlpdsp.o
  OBJS-$(CONFIG_MPEGAUDIODSP)            += x86/mpegaudiodsp.o
  OBJS-$(CONFIG_MPEGVIDEO)               += x86/mpegvideo.o
  OBJS-$(CONFIG_MPEGVIDEOENC)            += x86/mpegvideoenc.o
+ OBJS-$(CONFIG_VIDEODSP)                += x86/videodsp_init.o
+ OBJS-$(CONFIG_VP3DSP)                  += x86/vp3dsp_init.o
+ OBJS-$(CONFIG_XMM_CLOBBER_TEST)        += x86/w64xmmtest.o
+ 
+ OBJS-$(CONFIG_AAC_DECODER)             += x86/sbrdsp_init.o
+ OBJS-$(CONFIG_CAVS_DECODER)            += x86/cavsdsp.o
+ OBJS-$(CONFIG_DCA_DECODER)             += x86/dcadsp_init.o
+ OBJS-$(CONFIG_DNXHD_ENCODER)           += x86/dnxhdenc.o
+ OBJS-$(CONFIG_MLP_DECODER)             += x86/mlpdsp.o
  OBJS-$(CONFIG_PNG_DECODER)             += x86/pngdsp_init.o
  OBJS-$(CONFIG_PRORES_DECODER)          += x86/proresdsp_init.o
 +OBJS-$(CONFIG_PRORES_LGPL_DECODER)     += x86/proresdsp_init.o
  OBJS-$(CONFIG_RV30_DECODER)            += x86/rv34dsp_init.o
  OBJS-$(CONFIG_RV40_DECODER)            += x86/rv34dsp_init.o            \
                                            x86/rv40dsp_init.o
 +OBJS-$(CONFIG_V210_DECODER)            += x86/v210-init.o
 +OBJS-$(CONFIG_TTA_DECODER)             += x86/ttadsp_init.o
  OBJS-$(CONFIG_TRUEHD_DECODER)          += x86/mlpdsp.o
  OBJS-$(CONFIG_VC1_DECODER)             += x86/vc1dsp_init.o
- OBJS-$(CONFIG_VIDEODSP)                += x86/videodsp_init.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += x86/vorbisdsp_init.o
- OBJS-$(CONFIG_VP3DSP)                  += x86/vp3dsp_init.o
  OBJS-$(CONFIG_VP6_DECODER)             += x86/vp6dsp_init.o
  OBJS-$(CONFIG_VP8_DECODER)             += x86/vp8dsp_init.o
  OBJS-$(CONFIG_VP9_DECODER)             += x86/vp9dsp_init.o
- OBJS-$(CONFIG_XMM_CLOBBER_TEST)        += x86/w64xmmtest.o
 +OBJS-$(CONFIG_WEBP_DECODER)            += x86/vp8dsp_init.o
  
  MMX-OBJS-$(CONFIG_DSPUTIL)             += x86/dsputil_mmx.o             \
                                            x86/fpel_mmx.o                \
@@@ -56,19 -49,14 +57,18 @@@ MMX-OBJS-$(CONFIG_DIRAC_DECODER)       
  MMX-OBJS-$(CONFIG_HPELDSP)             += x86/fpel_mmx.o                \
                                            x86/hpeldsp_mmx.o             \
                                            x86/rnd_mmx.o
+ 
 +MMX-OBJS-$(CONFIG_SNOW_DECODER)        += x86/snowdsp.o
 +MMX-OBJS-$(CONFIG_SNOW_ENCODER)        += x86/snowdsp.o
  MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o
  
  YASM-OBJS                              += x86/deinterlace.o             \
                                            x86/fmtconvert.o              \
  
- YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
  YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
- YASM-OBJS-$(CONFIG_DCA_DECODER)        += x86/dcadsp.o
  YASM-OBJS-$(CONFIG_DCT)                += x86/dct32.o
 +YASM-OBJS-$(CONFIG_DIRAC_DECODER)      += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\
 +                                          x86/dwt_yasm.o
  YASM-OBJS-$(CONFIG_DSPUTIL)            += x86/dsputil.o                 \
                                            x86/fpel.o                    \
                                            x86/mpeg4qpel.o               \
@@@ -93,20 -80,19 +93,23 @@@ YASM-OBJS-$(CONFIG_H264QPEL)           
                                            x86/qpel.o
  YASM-OBJS-$(CONFIG_HPELDSP)            += x86/fpel.o                    \
                                            x86/hpeldsp.o
 +YASM-OBJS-$(CONFIG_LLVIDDSP)           += x86/lossless_videodsp.o
  YASM-OBJS-$(CONFIG_MPEGAUDIODSP)       += x86/imdct36.o
+ YASM-OBJS-$(CONFIG_VIDEODSP)           += x86/videodsp.o
+ YASM-OBJS-$(CONFIG_VP3DSP)             += x86/vp3dsp.o
+ 
+ YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
+ YASM-OBJS-$(CONFIG_DCA_DECODER)        += x86/dcadsp.o
  YASM-OBJS-$(CONFIG_PNG_DECODER)        += x86/pngdsp.o
  YASM-OBJS-$(CONFIG_PRORES_DECODER)     += x86/proresdsp.o
 +YASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
  YASM-OBJS-$(CONFIG_RV30_DECODER)       += x86/rv34dsp.o
  YASM-OBJS-$(CONFIG_RV40_DECODER)       += x86/rv34dsp.o                 \
                                            x86/rv40dsp.o
 +YASM-OBJS-$(CONFIG_TTA_DECODER)        += x86/ttadsp.o
 +YASM-OBJS-$(CONFIG_V210_DECODER)       += x86/v210.o
  YASM-OBJS-$(CONFIG_VC1_DECODER)        += x86/vc1dsp.o
- YASM-OBJS-$(CONFIG_VIDEODSP)           += x86/videodsp.o
  YASM-OBJS-$(CONFIG_VORBIS_DECODER)     += x86/vorbisdsp.o
- YASM-OBJS-$(CONFIG_VP3DSP)             += x86/vp3dsp.o
  YASM-OBJS-$(CONFIG_VP6_DECODER)        += x86/vp6dsp.o
  YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/vp8dsp.o                  \
                                            x86/vp8dsp_loopfilter.o