diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-07-12 15:19:51 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-07-12 15:19:51 +0000 |
| commit | f7f03a6303fbd646d3e687f566a40ea7febf5bc3 (patch) | |
| tree | 2a1a3b2fb4db2fd5370228e935a36280a75480e2 | |
| parent | 0607887f0d5b57c9e88276ce19e9d163692d002b (diff) | |
| download | ffmpeg-f7f03a6303fbd646d3e687f566a40ea7febf5bc3.tar.gz | |
Remove MPlayer-specific include option hacks.
Originally committed as revision 5723 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libpostproc/Makefile | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index ba7162d9e3..d5568ce604 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -227,7 +227,6 @@ OBJS-$(CONFIG_AC3)$(CONFIG_A52BIN) += liba52/bit_allocate.o \ # currently using libdts for dts decoding OBJS-$(CONFIG_DTS) += dtsdec.o -CFLAGS-$(CONFIG_DTS) += $(DTS_INC) OBJS-$(AMR) += amr.o OBJS-$(AMR_NB) += amr_float/sp_dec.o \ @@ -319,7 +318,6 @@ sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc # sun mediaLib specific stuff OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o -CFLAGS-$(HAVE_MLIB) += $(MLIB_INC) # alpha specific stuff OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha.o \ diff --git a/libpostproc/Makefile b/libpostproc/Makefile index 60319bad89..9e94aa0402 100644 --- a/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -15,7 +15,7 @@ SHARED_OBJS=postprocess_pic.o 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/ include $(SRC_PATH)/common.mak |