diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 00:26:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 00:26:46 +0100 |
| commit | 3bf5c05925b53a02e59fd8f74df8947731411216 (patch) | |
| tree | 3dbdd89dd3fd96e5cb1c7380e289277327529382 | |
| parent | 0dd4eff588c59d0c1412eb4a907004017e76badd (diff) | |
| parent | ede2b451ccb1b2317858c7a32784a9b739ba45f4 (diff) | |
| download | ffmpeg-3bf5c05925b53a02e59fd8f74df8947731411216.tar.gz | |
Merge commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4'
* commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4':
build: Sort h264 objects
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 43c3f87260..134c999aaa 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -231,10 +231,10 @@ OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o \ 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 \ |