# HG changeset patch
# User reimar
# Date 1122934157 0
# Node ID 99c188fbdba433cd244b7d9eea648c7668fad569
# Parent  c530f957d55c83a036a66f0463e99a95fe52a5a5
libavutil compile fix (working also with old libavcodec)

diff -r c530f957d55c -r 99c188fbdba4 libaf/Makefile
--- a/libaf/Makefile	Mon Aug 01 21:16:43 2005 +0000
+++ b/libaf/Makefile	Mon Aug 01 22:09:17 2005 +0000
@@ -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_
diff -r c530f957d55c -r 99c188fbdba4 libaf/af_lavcresample.c
--- a/libaf/af_lavcresample.c	Mon Aug 01 21:16:43 2005 +0000
+++ b/libaf/af_lavcresample.c	Mon Aug 01 22:09:17 2005 +0000
@@ -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