[MPlayer-cvslog] CVS: main/libaf Makefile, 1.24, 1.25 af_lavcresample.c, 1.9, 1.10

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libaf
In directory mail:/var2/tmp/cvs-serv4839

Modified Files:
	Makefile af_lavcresample.c 
Log Message:
libavutil compile fix (working also with old libavcodec)


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile	19 Jun 2005 22:52:55 -0000	1.24
+++ Makefile	1 Aug 2005 22:09:17 -0000	1.25
@@ -28,9 +28,17 @@
      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_

Index: af_lavcresample.c
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/af_lavcresample.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- af_lavcresample.c	1 Aug 2005 21:16:43 -0000	1.9
+++ af_lavcresample.c	1 Aug 2005 22:09:17 -0000	1.10
@@ -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