[MPlayer-cvslog] CVS: main/libmpdemux video.c, 1.58, 1.59 demux_asf.c, 1.38, 1.39 demux_real.c, 1.80, 1.81 demux_viv.c, 1.29, 1.30

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv17647

Modified Files:
	video.c demux_asf.c demux_real.c demux_viv.c 
Log Message:
include the right avcodec.h, consistently with the rest of mplayer

Index: video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/video.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- video.c	7 Jan 2006 22:20:46 -0000	1.58
+++ video.c	8 Jan 2006 14:03:41 -0000	1.59
@@ -22,8 +22,10 @@
 /* sub_cc (closed captions)*/
 #include "sub_cc.h"
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif

Index: demux_asf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_asf.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- demux_asf.c	24 Dec 2005 12:48:01 -0000	1.38
+++ demux_asf.c	8 Jan 2006 14:03:41 -0000	1.39
@@ -62,8 +62,10 @@
   *src = dst;
 }
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif

Index: demux_real.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- demux_real.c	4 Jan 2006 23:36:36 -0000	1.80
+++ demux_real.c	8 Jan 2006 14:03:41 -0000	1.81
@@ -32,8 +32,10 @@
 #include "stheader.h"
 #include "bswap.h"
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif

Index: demux_viv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_viv.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- demux_viv.c	19 Dec 2005 19:38:28 -0000	1.29
+++ demux_viv.c	8 Jan 2006 14:03:42 -0000	1.30
@@ -15,8 +15,10 @@
 #include "stheader.h"
 #include "bswap.h"
 
-#ifdef USE_LIBAVCODEC
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC_SO
+#include <ffmpeg/avcodec.h>
+#elif defined(USE_LIBAVCODEC)
+#include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
 #endif