Merge commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 23:26:46 +0000 (00:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 23:26:46 +0000 (00:26 +0100)
* commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4':
  build: Sort h264 objects

Conflicts:
libavcodec/Makefile

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

@@@ -231,11 -194,10 +231,11 @@@ OBJS-$(CONFIG_H263_DECODER)            
                                            intelh263dec.o
  OBJS-$(CONFIG_H263_ENCODER)            += mpeg4videoenc.o mpeg4video.o  \
                                            h263.o ituh263enc.o flvenc.o
- OBJS-$(CONFIG_H264_DECODER)            += h264.o                               \
-                                           h264_loopfilter.o h264_direct.o      \
-                                           cabac.o h264_sei.o h264_ps.o         \
-                                           h264_refs.o h264_cavlc.o h264_cabac.o
+ OBJS-$(CONFIG_H264_DECODER)            += h264.o h264_cabac.o h264_cavlc.o \
+                                           h264_direct.o h264_loopfilter.o  \
+                                           h264_ps.o h264_refs.o h264_sei.o \
+                                           cabac.o
 +OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o
  OBJS-$(CONFIG_HEVC_DECODER)            += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
                                            hevc_cabac.o hevc_refs.o hevcpred.o    \
                                            hevcdsp.o hevc_filter.o cabac.o