aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2016-01-24 20:30:33 -0300
committerJames Almer <jamrial@gmail.com>2016-01-24 20:30:33 -0300
commit1d8f9b7d1ad2a58f612b47e769d00e6f8891d881 (patch)
tree1a798b322ab25a553c3c0c3aa0392d4fc7fa9466
parentcde57eee98d2e26daeeb1ba0cdd1f3d3acb3eb8a (diff)
downloadffmpeg-1d8f9b7d1ad2a58f612b47e769d00e6f8891d881.tar.gz
avcodec/webp: fix decoder dependencies
Signed-off-by: James Almer <jamrial@gmail.com>
-rwxr-xr-xconfigure2
-rw-r--r--libavcodec/Makefile3
2 files changed, 2 insertions, 3 deletions
diff --git a/configure b/configure
index 6fdb5ddcf9..0685133975 100755
--- a/configure
+++ b/configure
@@ -2449,7 +2449,7 @@ vp6f_decoder_select="vp6_decoder"
vp7_decoder_select="h264pred videodsp vp8dsp"
vp8_decoder_select="h264pred videodsp vp8dsp"
vp9_decoder_select="videodsp vp9_parser"
-webp_decoder_select="vp8_decoder"
+webp_decoder_select="vp8_decoder exif"
wmalossless_decoder_select="llauddsp"
wmapro_decoder_select="mdct sinewin wma_freqs"
wmav1_decoder_select="mdct sinewin wma_freqs"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b9ffdb9819..472c662db6 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -561,8 +561,7 @@ OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o
OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o
OBJS-$(CONFIG_WAVPACK_ENCODER) += wavpackenc.o
-OBJS-$(CONFIG_WEBP_DECODER) += vp8.o vp8dsp.o vp56rac.o
-OBJS-$(CONFIG_WEBP_DECODER) += webp.o exif.o tiff_common.o
+OBJS-$(CONFIG_WEBP_DECODER) += webp.o
OBJS-$(CONFIG_WEBVTT_DECODER) += webvttdec.o ass.o
OBJS-$(CONFIG_WEBVTT_ENCODER) += webvttenc.o ass_split.o
OBJS-$(CONFIG_WMALOSSLESS_DECODER) += wmalosslessdec.o wma_common.o