libavutil compile fix (working also with old libavcodec)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16169 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-08-01 22:09:17 +00:00
parent e5b52ff472
commit 19760a4dca
2 changed files with 11 additions and 3 deletions

View File

@ -28,9 +28,17 @@ SRCS=af.c \
window.c \
$(OPTIONAL_SRCS) \
LIBAV_INC =
ifeq ($(CONFIG_LIBAVUTIL),yes)
LIBAV_INC += -I../libavutil
endif
ifeq ($(CONFIG_LIBAVCODEC),yes)
LIBAV_INC += -I../libavcodec
endif
OBJS=$(SRCS:.c=.o)
CFLAGS = $(OPTFLAGS) -I. -Wall $(EXTRA_INC) -D_GNU_SOURCE
CFLAGS = $(OPTFLAGS) -I. -Wall $(LIBAV_INC) $(EXTRA_INC) -D_GNU_SOURCE
ifeq ($(TARGET_OS),MINGW32)
CFLAGS += -D_IO_H_

View File

@ -15,8 +15,8 @@
#include <ffmpeg/avcodec.h>
#include <ffmpeg/rational.h>
#else
#include "../libavcodec/avcodec.h"
#include "../libavutil/rational.h"
#include "avcodec.h"
#include "rational.h"
#endif
#define CHANS 6