Merge commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 22:34:53 +0000 (00:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 22:34:53 +0000 (00:34 +0200)
* commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d':
  x86: build: Restore ordering of OBJS lines

Conflicts:
libavcodec/x86/Makefile

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

@@@ -15,10 -13,7 +15,9 @@@ OBJS-$(CONFIG_H264CHROMA)              
  OBJS-$(CONFIG_H264DSP)                 += x86/h264dsp_init.o
  OBJS-$(CONFIG_H264PRED)                += x86/h264_intrapred_init.o
  OBJS-$(CONFIG_H264QPEL)                += x86/h264_qpel.o
- OBJS-$(CONFIG_HEVC_DECODER)            += x86/hevcdsp_init.o
  OBJS-$(CONFIG_HPELDSP)                 += x86/hpeldsp_init.o
 +OBJS-$(CONFIG_LLAUDDSP)                += x86/lossless_audiodsp_init.o
 +OBJS-$(CONFIG_LLVIDDSP)                += x86/lossless_videodsp_init.o
  OBJS-$(CONFIG_HUFFYUVDSP)              += x86/huffyuvdsp_init.o
  OBJS-$(CONFIG_HUFFYUVENCDSP)           += x86/huffyuvencdsp_mmx.o
  OBJS-$(CONFIG_IDCTDSP)                 += x86/idctdsp_init.o
@@@ -117,10 -101,11 +114,13 @@@ YASM-OBJS-$(CONFIG_VIDEODSP)           
  YASM-OBJS-$(CONFIG_VP3DSP)             += x86/vp3dsp.o
  
  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