summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2008-03-06 20:44:44 +0000
committerMåns Rullgård <mans@mansr.com>2008-03-06 20:44:44 +0000
commit5671fc14f67dd20bb9c4a787022987c39498f44f (patch)
treec390cc924efbd489b32a6589f1deba5429e04b16 /libavcodec
parent4c7981ba7c532928dbe60934a9fc951dbf8a34b5 (diff)
downloadffmpeg-streaming-5671fc14f67dd20bb9c4a787022987c39498f44f.zip
ffmpeg-streaming-5671fc14f67dd20bb9c4a787022987c39498f44f.tar.gz
consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment
Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4fc2afd..22b2f48 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -4,8 +4,6 @@
#
include ../config.mak
-CFLAGS += -I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec
-
OBJS = allcodecs.o \
audioconvert.o \
bitstream.o \
@@ -456,7 +454,7 @@ ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \
bfin/idct_bfin.o \
bfin/vp3_idct_bfin.o \
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+FFLIBS = avutil
NAME=avcodec
LIBVERSION=$(LAVCVERSION)
OpenPOWER on IntegriCloud