[MPlayer-cvslog] CVS: main/libmpcodecs Makefile, 1.146, 1.147 ad_ffmpeg.c, 1.19, 1.20

[Alexander Strasser beastd]

CVS change done by Alexander Strasser (beastd)

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv16757/libmpcodecs

Modified Files:
	Makefile ad_ffmpeg.c 
Log Message:
Support new static libavcodec (depends on libavutil).


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- Makefile	10 Jul 2005 17:14:11 -0000	1.146
+++ Makefile	1 Aug 2005 20:16:56 -0000	1.147
@@ -183,7 +183,12 @@
 ENCODER_SRCS += ae_lame.c
 endif
 
+LIBAV_INC =
+ifeq ($(CONFIG_LIBAVUTIL),yes)
+LIBAV_INC += -I../libavutil
+endif
 ifeq ($(CONFIG_LIBAVCODEC),yes)
+LIBAV_INC += -I../libavcodec
 ENCODER_SRCS += ae_lavc.c
 endif
 
@@ -201,7 +206,7 @@
 SRCS2=$(ENCODER_SRCS)
 OBJS2=$(SRCS2:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
+CFLAGS  = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(LIBAV_INC) $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE
 
 .SUFFIXES: .c .o
 

Index: ad_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_ffmpeg.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ad_ffmpeg.c	6 Mar 2005 17:55:31 -0000	1.19
+++ ad_ffmpeg.c	1 Aug 2005 20:16:56 -0000	1.20
@@ -28,7 +28,7 @@
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
 #else
-#include "libavcodec/avcodec.h"
+#include "avcodec.h"
 #endif
 
 extern int avcodec_inited;