summaryrefslogtreecommitdiff
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-06-07 20:14:56 +0000
committerDiego Biurrun <diego@biurrun.de>2009-06-07 20:14:56 +0000
commit9ad437eafbb34cedbc9c07f24f9143d9d53e839f (patch)
tree76ed87541006c3ab72e2b0059cb508f5c090ae9f /libavcodec/Makefile
parent4fcef88c4d015da8e8ba8c2298c24d73eb95e73c (diff)
downloadffmpeg-9ad437eafbb34cedbc9c07f24f9143d9d53e839f.tar.gz
Merge OpenCORE AMR support from trunk.
Originally committed as revision 19133 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 5067354da1..cf742d17f4 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -366,6 +366,8 @@ OBJS-$(CONFIG_LIBFAAC) += libfaac.o
OBJS-$(CONFIG_LIBFAAD) += libfaad.o
OBJS-$(CONFIG_LIBGSM) += libgsm.o
OBJS-$(CONFIG_LIBMP3LAME) += libmp3lame.o
+OBJS-$(CONFIG_LIBOPENCORE_AMRNB) += libopencore-amr.o
+OBJS-$(CONFIG_LIBOPENCORE_AMRWB) += libopencore-amr.o
OBJS-$(CONFIG_LIBOPENJPEG) += libopenjpeg.o
OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o libschroedinger.o libdirac_libschro.o
OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.o libschroedinger.o libdirac_libschro.o