diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 11:54:53 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 11:54:53 +0100 |
| commit | 9809371aa5402d724cfaf74236bfe2ddb9829676 (patch) | |
| tree | 921c9142acc9c15aa61db94deff890c85904df52 /libavcodec/Makefile | |
| parent | a5a6621616aac55b8284002af4fef35b66e2b2d1 (diff) | |
| parent | a7da517f6a5c472f46f67dd33bb6b95ccc919923 (diff) | |
| download | ffmpeg-9809371aa5402d724cfaf74236bfe2ddb9829676.tar.gz | |
Merge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923'
* commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923':
h264data: Move all data tables from a header to a .c file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index bc4c97f3d1..679f2f22b4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -308,7 +308,7 @@ OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \ OBJS-$(CONFIG_H264_DECODER) += h264.o h264_cabac.o h264_cavlc.o \ h264_direct.o h264_loopfilter.o \ h264_mb.o h264_picture.o h264_ps.o \ - h264_refs.o h264_sei.o h264_slice.o + h264_refs.o h264_sei.o h264_slice.o h264data.o OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec_h264.o OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o OBJS-$(CONFIG_H264_VDA_DECODER) += vda_h264_dec.o |