Mercurial > mplayer.hg

changeset 16168:99c188fbdba4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libavutil compile fix (working also with old libavcodec)
author reimar
date Mon, 01 Aug 2005 22:09:17 +0000
parents c530f957d55c
children 66a7b211a751
files libaf/Makefile libaf/af_lavcresample.c
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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_
--- 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