diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 09:36:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 09:36:34 +0200 |
| commit | 73d5cf8f43786b3a643d9955e4c6499f5b391b81 (patch) | |
| tree | 8b6435ea549944a7863eda9629341a428a4ccb03 /libavcodec/Makefile | |
| parent | 5d199c3ad985eab4500cbfd2d1146ac70197ceac (diff) | |
| parent | 84d3ff50cd679e0f35f0b7ce2cb2cedd99169959 (diff) | |
| download | android_external_ffmpeg-73d5cf8f43786b3a643d9955e4c6499f5b391b81.tar.gz android_external_ffmpeg-73d5cf8f43786b3a643d9955e4c6499f5b391b81.tar.bz2 android_external_ffmpeg-73d5cf8f43786b3a643d9955e4c6499f5b391b81.zip | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add a libwavpack encoder wrapper
Conflicts:
Changelog
doc/encoders.texi
libavcodec/version.h
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 1aeea281e5..c6cd41b0c6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -715,6 +715,7 @@ OBJS-$(CONFIG_LIBVPX_VP8_DECODER) += libvpxdec.o OBJS-$(CONFIG_LIBVPX_VP8_ENCODER) += libvpxenc.o OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o +OBJS-$(CONFIG_LIBWAVPACK_ENCODER) += libwavpackenc.o OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o |