diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 11:53:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 11:53:41 +0100 |
| commit | 6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd (patch) | |
| tree | 6d894ef0fb24a5394ce4341e2404d6668f8d23f1 /libavcodec/Makefile | |
| parent | 9b195dd5793edb88a72d53cb080c2216e91a5849 (diff) | |
| parent | be7c323176e2e5fcf30e3d2ff20975b2f936811b (diff) | |
| download | ffmpeg-6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd.tar.gz | |
Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'
* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b':
Add a libwebp encoder
Conflicts:
Changelog
doc/encoders.texi
doc/general.texi
libavcodec/version.h
libavformat/img2enc.c
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 4ce11f16bb..fbcc576735 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -734,6 +734,7 @@ OBJS-$(CONFIG_LIBVPX_VP8_ENCODER) += libvpxenc.o OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o libvpx.o OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o libvpx.o OBJS-$(CONFIG_LIBWAVPACK_ENCODER) += libwavpackenc.o +OBJS-$(CONFIG_LIBWEBP_ENCODER) += libwebpenc.o OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o |