Commit f7f03a63 authored by Diego Biurrun's avatar Diego Biurrun

Remove MPlayer-specific include option hacks.

Originally committed as revision 5723 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0607887f
...@@ -227,7 +227,6 @@ OBJS-$(CONFIG_AC3)$(CONFIG_A52BIN) += liba52/bit_allocate.o \ ...@@ -227,7 +227,6 @@ OBJS-$(CONFIG_AC3)$(CONFIG_A52BIN) += liba52/bit_allocate.o \
# currently using libdts for dts decoding # currently using libdts for dts decoding
OBJS-$(CONFIG_DTS) += dtsdec.o OBJS-$(CONFIG_DTS) += dtsdec.o
CFLAGS-$(CONFIG_DTS) += $(DTS_INC)
OBJS-$(AMR) += amr.o OBJS-$(AMR) += amr.o
OBJS-$(AMR_NB) += amr_float/sp_dec.o \ OBJS-$(AMR_NB) += amr_float/sp_dec.o \
...@@ -319,7 +318,6 @@ sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc ...@@ -319,7 +318,6 @@ sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
# sun mediaLib specific stuff # sun mediaLib specific stuff
OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o
CFLAGS-$(HAVE_MLIB) += $(MLIB_INC)
# alpha specific stuff # alpha specific stuff
OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha.o \ OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha.o \
......
...@@ -15,7 +15,7 @@ SHARED_OBJS=postprocess_pic.o ...@@ -15,7 +15,7 @@ SHARED_OBJS=postprocess_pic.o
HEADERS = postprocess.h HEADERS = postprocess.h
CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. -I$(SRC_PATH)/libavcodec $(EXTRA_INC) CFLAGS = $(OPTFLAGS) -I. -I.. -I$(SRC_PATH)/libavcodec
# -I/usr/X11R6/include/ # -I/usr/X11R6/include/
include $(SRC_PATH)/common.mak include $(SRC_PATH)/common.mak
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment