[Mplayer-cvslog] CVS: main dec_audio.c,1.48,1.49 dec_video.c,1.52,1.53

Nick Kurshev nick at mplayer.dev.hu
Sat Oct 27 15:38:16 CEST 2001


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv4480/main

Modified Files:
	dec_audio.c dec_video.c 
Log Message:
libffmpeg.so support

Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_audio.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- dec_audio.c	23 Oct 2001 17:26:20 -0000	1.48
+++ dec_audio.c	27 Oct 2001 13:38:13 -0000	1.49
@@ -59,7 +59,11 @@
 #endif
 
 #ifdef USE_LIBAVCODEC
+#ifdef USE_LIBAVCODEC_SO
+#include <libffmpeg/avcodec.h>
+#else
 #include "libavcodec/avcodec.h"
+#endif
     static AVCodec *lavc_codec=NULL;
     static AVCodecContext lavc_context;
     extern int avcodec_inited;

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- dec_video.c	22 Oct 2001 22:45:06 -0000	1.52
+++ dec_video.c	27 Oct 2001 13:38:13 -0000	1.53
@@ -51,7 +51,11 @@
 #endif
 
 #ifdef USE_LIBAVCODEC
+#ifdef USE_LIBAVCODEC_SO
+#include <libffmpeg/avcodec.h>
+#else
 #include "libavcodec/avcodec.h"
+#endif
     static AVCodec *lavc_codec=NULL;
     static AVCodecContext lavc_context;
     static AVPicture lavc_picture;




More information about the MPlayer-cvslog mailing list