summaryrefslogtreecommitdiffstats
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-04-14 15:24:57 +0200
committerDiego Biurrun <diego@biurrun.de>2012-05-07 14:31:59 +0200
commit9cef0669c4e0e98cd6b5746e6de5b0da800f7edb (patch)
treece265b0fed27b3d643b6fa5e9a412f0f990ab089 /libavcodec/Makefile
parent8134fafe9bdda58e24a9574c251ed3a9b5809c51 (diff)
downloadffmpeg-streaming-9cef0669c4e0e98cd6b5746e6de5b0da800f7edb.zip
ffmpeg-streaming-9cef0669c4e0e98cd6b5746e6de5b0da800f7edb.tar.gz
Move code shared between libdirac and libschroedinger to libschroedinger.
This also involves making some function static and changing the name prefixes of some functions and structures.
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 55767f7..98d70f0 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -601,11 +601,9 @@ OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o
OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o
OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpeg.o
OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o \
- libschroedinger.o \
- libdirac_libschro.o
+ libschroedinger.o
OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.o \
- libschroedinger.o \
- libdirac_libschro.o
+ libschroedinger.o
OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o
OBJS-$(CONFIG_LIBSPEEX_ENCODER) += libspeexenc.o audio_frame_queue.o
OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
OpenPOWER on IntegriCloud