diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 03:46:20 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 03:46:20 +0400 |
| commit | 0626211b561f299971a96b7bd1ee6f8a6d6735c8 (patch) | |
| tree | a68cc87fa123e1f5e488fbbb6dbc68518088ed73 /libavcodec/Makefile | |
| parent | 3bf5c05925b53a02e59fd8f74df8947731411216 (diff) | |
| parent | e9a77f4bc084e5174baba3a8bc869ce4d102c4f0 (diff) | |
Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'
* commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0':
h264: move macroblock decoding into its own file
Conflicts:
libavcodec/Makefile
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 134c999aaa..9cabcae620 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -233,8 +233,8 @@ OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \ h263.o ituh263enc.o flvenc.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 + h264_mb.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 \ |