diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 19:40:06 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 19:41:55 +0000 |
commit | c82d31808bdcbafb1489cfb5d8e22c5272b484eb (patch) | |
tree | 641e42cdcf41ee4a7bd59bd81618b53b2173339d /libavcodec/Makefile | |
parent | 58dd885f9ae7feee002773253e345e11e7142739 (diff) | |
parent | f7d77b9a5dd42bf0f5dffecf590466b4c4239437 (diff) |
Merge commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437'
* commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437':
eatqi: Remove MpegEncContext dependency
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 f6a4fbbdfc..baffb29f4a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -258,7 +258,7 @@ OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o eaidct.o mpeg12.o \ mpeg12data.o OBJS-$(CONFIG_EATGQ_DECODER) += eatgq.o eaidct.o OBJS-$(CONFIG_EATGV_DECODER) += eatgv.o -OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o +OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o |