diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 12:06:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 12:36:11 +0200 |
| commit | b26ccf218d933660c551832b4b14976b2acb3f0c (patch) | |
| tree | 149a7c27caf046cc105156d9e481cd7af651a90c /libavcodec/Makefile | |
| parent | ac2fc63ac6f938a4c995d87486013baffb5ca18a (diff) | |
| parent | c4bfa098072ba338d83555d6e2199f7e1e64ffff (diff) | |
| download | android_external_ffmpeg-b26ccf218d933660c551832b4b14976b2acb3f0c.tar.gz android_external_ffmpeg-b26ccf218d933660c551832b4b14976b2acb3f0c.tar.bz2 android_external_ffmpeg-b26ccf218d933660c551832b4b14976b2acb3f0c.zip | |
Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'
* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff':
Add a WebP decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
libavformat/img2.c
The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0f53a7a805..6c084d55a3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -476,6 +476,7 @@ 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 OBJS-$(CONFIG_WEBVTT_DECODER) += webvttdec.o OBJS-$(CONFIG_WMALOSSLESS_DECODER) += wmalosslessdec.o wma_common.o OBJS-$(CONFIG_WMAPRO_DECODER) += wmaprodec.o wma.o wma_common.o |