header inclusion has to depend on the configure detection, because when

always using <avcodec.h>, someone who has external ffmpeg installed, but
wants to use xine's internal one will include the wrong headers

CVS patchset: 6888
CVS date: 2004/08/16 15:31:23

4 files changed, 35 insertions, 9 deletions

diff --git a/src/libffmpeg/dvaudio_decoder.c b/src/libffmpeg/dvaudio_decoder.c
index 4b4420ba5..c03fd73f6 100644
--- a/src/libffmpeg/dvaudio_decoder.c
+++ b/src/libffmpeg/dvaudio_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: dvaudio_decoder.c,v 1.3 2004/07/31 18:57:45 valtri Exp $
+ * $Id: dvaudio_decoder.c,v 1.4 2004/08/16 15:31:23 mroi Exp $
  *
  * dv audio decoder based on patch by Dan Dennedy <dan@dennedy.org>
  *
@@ -56,8 +56,13 @@
 #  undef uint64_t
 #endif
 
-#include <avcodec.h>
-#include "libavcodec/dvdata.h"
+#ifdef HAVE_FFMPEG
+#  include <avcodec.h>
+#  include <dvdata.h>
+#else
+#  include "libavcodec/avcodec.h"
+#  include "libavcodec/dvdata.h"
+#endif
 
 #ifdef _MSC_VER
 #  undef malloc
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c
index 8cff6acff..35f88b1e1 100644
--- a/src/libffmpeg/video_decoder.c
+++ b/src/libffmpeg/video_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_decoder.c,v 1.25 2004/07/31 18:57:45 valtri Exp $
+ * $Id: video_decoder.c,v 1.26 2004/08/16 15:31:23 mroi Exp $
  *
  * xine video decoder plugin using ffmpeg
  *
@@ -47,7 +47,11 @@
 #include "xine_decoder.h"
 #include "mpeg_parser.h"
 
-#include <postprocess.h>
+#ifdef HAVE_FFMPEG
+#  include <postprocess.h>
+#else
+#  include "libavcodec/libpostproc/postprocess.h"
+#endif
 
 #define VIDEOBUFSIZE        (128*1024)
 #define SLICE_BUFFER_SIZE   (1194*1024)
diff --git a/src/libffmpeg/xine_decoder.h b/src/libffmpeg/xine_decoder.h
index 91d32bff7..3119a41db 100644
--- a/src/libffmpeg/xine_decoder.h
+++ b/src/libffmpeg/xine_decoder.h
@@ -17,13 +17,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.h,v 1.2 2004/07/31 18:57:45 valtri Exp $
+ * $Id: xine_decoder.h,v 1.3 2004/08/16 15:31:23 mroi Exp $
  *
  */
  
 #ifndef HAVE_XINE_DECODER_H
 #define HAVE_XINE_DECODER_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef _MSC_VER
 /* ffmpeg has own definitions of those types */
 #  undef int8_t
@@ -36,7 +40,11 @@
 #  undef uint64_t
 #endif
 
-#include <avcodec.h>
+#ifdef HAVE_FFMPEG
+#  include <avcodec.h>
+#else
+#  include "libavcodec/avcodec.h"
+#endif
 
 #ifdef _MSC_VER
 #  undef malloc
diff --git a/src/libffmpeg/xine_encoder.c b/src/libffmpeg/xine_encoder.c
index 07bf9b8fa..e6d4da926 100644
--- a/src/libffmpeg/xine_encoder.c
+++ b/src/libffmpeg/xine_encoder.c
@@ -17,11 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_encoder.c,v 1.17 2004/07/31 18:57:45 valtri Exp $
+ * $Id: xine_encoder.c,v 1.18 2004/08/16 15:31:23 mroi Exp $
  */
  
 /* mpeg encoders for the dxr3 video out plugin. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
@@ -34,7 +38,12 @@
 /* #define LOG */
 
 #include "video_out_dxr3.h"
-#include <avcodec.h>
+
+#ifdef HAVE_FFMPEG
+#  include <avcodec.h>
+#else
+#  include "libavcodec/avcodec.h"
+#endif
 
 /* buffer size for encoded mpeg1 stream; will hold one intra frame 
  * at 640x480 typical sizes are <50 kB. 512 kB should be plenty */