From 19760a4dca3ce5ba339bdfd907f58aa439007de5 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 1 Aug 2005 22:09:17 +0000
Subject: [PATCH] libavutil compile fix (working also with old libavcodec)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16169 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libaf/Makefile          | 10 +++++++++-
 libaf/af_lavcresample.c |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/libaf/Makefile b/libaf/Makefile
index 65f2c434bd..6191912397 100644
--- a/libaf/Makefile
+++ b/libaf/Makefile
@@ -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_
diff --git a/libaf/af_lavcresample.c b/libaf/af_lavcresample.c
index cb80f1ad2b..b271be2a72 100644
--- a/libaf/af_lavcresample.c
+++ b/libaf/af_lavcresample.c
@@ -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