diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 01:24:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 01:33:02 +0100 |
| commit | ffd77f94a26be22b8ead3178ceec3ed39e68abc5 (patch) | |
| tree | 0e7982c66986de2d8aa41102610a87866e042bec /libavcodec/Makefile | |
| parent | 0626211b561f299971a96b7bd1ee6f8a6d6735c8 (diff) | |
| parent | f51d0f39c0fb3470d6b186974109428da91f1d1b (diff) | |
| download | ffmpeg-ffd77f94a26be22b8ead3178ceec3ed39e68abc5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Split h264 slice decoding from nal decoding
Conflicts:
libavcodec/Makefile
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9cabcae620..1182dcfcd4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -233,8 +233,9 @@ 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_mb.o h264_ps.o h264_refs.o \ - h264_sei.o cabac.o + h264_mb.o h264_picture.o h264_ps.o \ + h264_refs.o h264_sei.o h264_slice.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 \ |