diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 11:45:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 12:05:19 +0200 |
commit | 614cf1a6133a143961798c5d87c9bffc2ca0da9e (patch) | |
tree | bd72a843fa20e50578e1c8a8231262150136b322 /libavcodec/Makefile | |
parent | b69b075ac607419a840da798b089de8ea7630d4b (diff) | |
parent | 4f2b469da5e4ae221718ae479f6af627cfdebb91 (diff) |
Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91'
* commit '4f2b469da5e4ae221718ae479f6af627cfdebb91':
Add a libfdk-aac decoder
Conflicts:
configure
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 ce3cbf913c..650aed4020 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -683,6 +683,7 @@ OBJS-$(CONFIG_WTV_DEMUXER) += mpeg4audio.o mpegaudiodata.o OBJS-$(CONFIG_LIBAACPLUS_ENCODER) += libaacplus.o OBJS-$(CONFIG_LIBCELT_DECODER) += libcelt_dec.o OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o +OBJS-$(CONFIG_LIBFDK_AAC_DECODER) += libfdk-aacdec.o OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o OBJS-$(CONFIG_LIBGSM_DECODER) += libgsm.o OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsm.o |