diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 20:57:37 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 20:57:37 +0200 |
commit | 218f58a16a3dd6c1b3eecef18bb45c04439c7799 (patch) | |
tree | 98205644fd62945cb1ed816744dacc4193941b4d /libavcodec/Makefile | |
parent | 58f63670e173c1113ab231850572be303a21faef (diff) | |
parent | e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d (diff) |
Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'
* commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d':
mpegvideo: h263: Move all tables to a single file
Conflicts:
libavcodec/h263.h
libavcodec/h263data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 8912e453b1..98af702de1 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -266,7 +266,7 @@ OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261data.o h261.o OBJS-$(CONFIG_H261_ENCODER) += h261enc.o h261data.o h261.o OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o \ mpeg4video.o mpeg4videodec.o flvdec.o\ - intelh263dec.o + intelh263dec.o h263data.o 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 \ |