Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'

* commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6':
  build: Add explanatory comments to (optimization) blocks in the Makefiles

Conflicts:
	libavcodec/ppc/Makefile
	libavcodec/x86/Makefile

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

diff --cc libavcodec/Makefile
index 55b7b02,752340f..8173449
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -28,11 -24,9 +28,11 @@@ OBJS = allcodecs.
         options.o                                                        \
         parser.o                                                         \
         raw.o                                                            \
 +       resample.o                                                       \
 +       resample2.o                                                      \
         utils.o                                                          \
  
- # parts needed for many different codecs
+ # subsystems
  OBJS-$(CONFIG_AANDCTTABLES)            += aandcttab.o
  OBJS-$(CONFIG_AC3DSP)                  += ac3dsp.o
  OBJS-$(CONFIG_AUDIO_FRAME_QUEUE)       += audio_frame_queue.o

diff --cc libavcodec/arm/Makefile
index 41485b3,6cbb0b9..e0af6bc
--- 1/libavcodec/arm/Makefile
--- 2/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@@ -28,8 -28,10 +29,9 @@@ OBJS-$(CONFIG_PIXBLOCKDSP)             
  OBJS-$(CONFIG_VIDEODSP)                += arm/videodsp_init_arm.o
  OBJS-$(CONFIG_VP3DSP)                  += arm/vp3dsp_init_arm.o
  
+ # decoders/encoders
  OBJS-$(CONFIG_AAC_DECODER)             += arm/aacpsdsp_init_arm.o       \
                                            arm/sbrdsp_init_arm.o
 -OBJS-$(CONFIG_APE_DECODER)             += arm/apedsp_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
@@@ -109,9 -125,10 +126,10 @@@ NEON-OBJS-$(CONFIG_MPEGVIDEO)          
  NEON-OBJS-$(CONFIG_RDFT)               += arm/rdft_neon.o
  NEON-OBJS-$(CONFIG_VP3DSP)             += arm/vp3dsp_neon.o
  
+ # decoders/encoders
  NEON-OBJS-$(CONFIG_AAC_DECODER)        += arm/aacpsdsp_neon.o           \
                                            arm/sbrdsp_neon.o
 -NEON-OBJS-$(CONFIG_APE_DECODER)        += arm/apedsp_neon.o
 +NEON-OBJS-$(CONFIG_LLAUDDSP)           += arm/lossless_audiodsp_neon.o
  NEON-OBJS-$(CONFIG_DCA_DECODER)        += arm/dcadsp_neon.o             \
                                            arm/synth_filter_neon.o
  NEON-OBJS-$(CONFIG_RV30_DECODER)       += arm/rv34dsp_neon.o

diff --cc libavcodec/ppc/Makefile
index de7a7c7,c6ff0f1..6f7eeb7
--- 1/libavcodec/ppc/Makefile
--- 2/libavcodec/ppc/Makefile
+++ b/libavcodec/ppc/Makefile
@@@ -21,7 -21,8 +22,8 @@@ OBJS-$(CONFIG_PIXBLOCKDSP)             
  OBJS-$(CONFIG_VIDEODSP)                += ppc/videodsp_ppc.o
  OBJS-$(CONFIG_VP3DSP)                  += ppc/vp3dsp_altivec.o
  
 -OBJS-$(CONFIG_APE_DECODER)             += ppc/apedsp_altivec.o
+ # decoders/encoders
 +OBJS-$(CONFIG_LLAUDDSP)                += ppc/lossless_audiodsp_altivec.o
  OBJS-$(CONFIG_SVQ1_ENCODER)            += ppc/svq1enc_altivec.o
  OBJS-$(CONFIG_VC1_DECODER)             += ppc/vc1dsp_altivec.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += ppc/vorbisdsp_altivec.o

diff --cc libavcodec/x86/Makefile
index 4298262,d06c5a1..7ceb7e2
--- 1/libavcodec/x86/Makefile
--- 2/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@@ -1,9 -1,10 +1,10 @@@
  OBJS                                   += x86/constants.o               \
                                            x86/fmtconvert_init.o         \
  
+ # subsystems
  OBJS-$(CONFIG_AC3DSP)                  += x86/ac3dsp_init.o
  OBJS-$(CONFIG_AUDIODSP)                += x86/audiodsp_init.o
 -OBJS-$(CONFIG_BLOCKDSP)                += x86/blockdsp.o
 +OBJS-$(CONFIG_BLOCKDSP)                += x86/blockdsp_init.o
  OBJS-$(CONFIG_BSWAPDSP)                += x86/bswapdsp_init.o
  OBJS-$(CONFIG_DCT)                     += x86/dct_init.o
  OBJS-$(CONFIG_FDCTDSP)                 += x86/fdctdsp_init.o
@@@ -34,7 -31,9 +35,8 @@@ OBJS-$(CONFIG_VIDEODSP)                
  OBJS-$(CONFIG_VP3DSP)                  += x86/vp3dsp_init.o
  OBJS-$(CONFIG_XMM_CLOBBER_TEST)        += x86/w64xmmtest.o
  
+ # decoders/encoders
  OBJS-$(CONFIG_AAC_DECODER)             += x86/sbrdsp_init.o
 -OBJS-$(CONFIG_APE_DECODER)             += x86/apedsp_init.o
  OBJS-$(CONFIG_CAVS_DECODER)            += x86/cavsdsp.o
  OBJS-$(CONFIG_DCA_DECODER)             += x86/dcadsp_init.o
  OBJS-$(CONFIG_DNXHD_ENCODER)           += x86/dnxhdenc_init.o
@@@ -57,35 -53,35 +59,42 @@@ OBJS-$(CONFIG_VP6_DECODER)             
  OBJS-$(CONFIG_VP7_DECODER)             += x86/vp8dsp_init.o
  OBJS-$(CONFIG_VP8_DECODER)             += x86/vp8dsp_init.o
  OBJS-$(CONFIG_VP9_DECODER)             += x86/vp9dsp_init.o
 +OBJS-$(CONFIG_WEBP_DECODER)            += x86/vp8dsp_init.o
  
 -MMX-OBJS-$(CONFIG_AUDIODSP)            += x86/audiodsp_mmx.o
 -MMX-OBJS-$(CONFIG_HPELDSP)             += x86/fpel_mmx.o                \
 -                                          x86/hpeldsp_mmx.o
+ 
+ # GCC inline assembly optimizations
+ # subsystems
 +MMX-OBJS-$(CONFIG_DIRAC_DECODER)       += x86/dirac_dwt.o
  MMX-OBJS-$(CONFIG_FDCTDSP)             += x86/fdct.o
  MMX-OBJS-$(CONFIG_IDCTDSP)             += x86/idctdsp_mmx.o             \
                                            x86/simple_idct.o
 -MMX-OBJS-$(CONFIG_QPELDSP)             += x86/fpel_mmx.o
  
+ # decoders/encoders
  MMX-OBJS-$(CONFIG_MPEG4_DECODER)       += x86/idct_mmx_xvid.o           \
                                            x86/idct_sse2_xvid.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 optimizations
  YASM-OBJS                              += x86/deinterlace.o             \
                                            x86/fmtconvert.o              \
  
+ # subsystems
  YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
  YASM-OBJS-$(CONFIG_AUDIODSP)           += x86/audiodsp.o
 +YASM-OBJS-$(CONFIG_BLOCKDSP)           += x86/blockdsp.o
  YASM-OBJS-$(CONFIG_BSWAPDSP)           += x86/bswapdsp.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_DNXHD_ENCODER)      += x86/dnxhdenc.o
  YASM-OBJS-$(CONFIG_FFT)                += x86/fft.o
 +YASM-OBJS-$(CONFIG_FLAC_DECODER)       += x86/flacdsp.o
 +ifdef CONFIG_GPL
 +YASM-OBJS-$(CONFIG_FLAC_ENCODER)       += x86/flac_dsp_gpl.o
 +endif
  YASM-OBJS-$(CONFIG_H263DSP)            += x86/h263_loopfilter.o
  YASM-OBJS-$(CONFIG_H264CHROMA)         += x86/h264_chromamc.o           \
                                            x86/h264_chromamc_10bit.o
@@@ -117,14 -110,13 +126,15 @@@ YASM-OBJS-$(CONFIG_QPELDSP)            
  YASM-OBJS-$(CONFIG_VIDEODSP)           += x86/videodsp.o
  YASM-OBJS-$(CONFIG_VP3DSP)             += x86/vp3dsp.o
  
+ # decoders/encoders
  YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
 -YASM-OBJS-$(CONFIG_APE_DECODER)        += x86/apedsp.o
  YASM-OBJS-$(CONFIG_DCA_DECODER)        += x86/dcadsp.o
 -YASM-OBJS-$(CONFIG_HEVC_DECODER)       += x86/hevc_deblock.o
 +YASM-OBJS-$(CONFIG_HEVC_DECODER)       += x86/hevc_mc.o                 \
 +                                          x86/hevc_deblock.o            \
 +                                          x86/hevc_idct.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