FFmpeg now uses different (unified) #include paths.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2

13 files changed, 6 insertions, 69 deletions

diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c
index 937f7a44a8..4fa95ce89b 100644
--- a/libmpcodecs/ad_ffmpeg.c
+++ b/libmpcodecs/ad_ffmpeg.c
@@ -24,11 +24,7 @@ LIBAD_EXTERN(ffmpeg)
 
 #define assert(x)
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#else
-#include "avcodec.h"
-#endif
+#include "libavcodec/avcodec.h"
 
 extern int avcodec_initialized;
 
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c
index a13fb7ec52..68c03f4445 100644
--- a/libmpcodecs/ae_lavc.c
+++ b/libmpcodecs/ae_lavc.c
@@ -15,11 +15,7 @@
 #include "config.h"
 #include "libaf/af_format.h"
 #include "libaf/reorder_ch.h"
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#else
 #include "libavcodec/avcodec.h"
-#endif
 
 static AVCodec        *lavc_acodec;
 static AVCodecContext *lavc_actx;
@@ -30,11 +26,7 @@ extern int  lavc_param_audio_global_header;
 extern int  avcodec_initialized;
 static int compressed_frame_size = 0;
 #ifdef USE_LIBAVFORMAT
-#ifdef USE_LIBAVFORMAT_SO
-#include <ffmpeg/avformat.h>
-#else
 #include "libavformat/avformat.h"
-#endif
 extern const struct AVCodecTag *mp_wav_taglists[];
 #endif
 
diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c
index cac116f3eb..f62c42bc2a 100644
--- a/libmpcodecs/native/nuppelvideo.c
+++ b/libmpcodecs/native/nuppelvideo.c
@@ -20,11 +20,7 @@
 
 #include "libmpdemux/nuppelvideo.h" 
 #include "RTjpegN.h"
-#ifdef USE_LIBAVUTIL_SO
-#include <ffmpeg/lzo.h>
-#else
 #include "libavutil/lzo.h"
-#endif
 
 #define KEEP_BUFFER
 
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 60db717f58..97a4fa62cd 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -23,11 +23,7 @@ static vd_info_t info = {
 
 LIBVD_EXTERN(ffmpeg)
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#else
 #include "libavcodec/avcodec.h"
-#endif
 
 #ifdef HAVE_XVMC
 #include "xvmc_render.h"
diff --git a/libmpcodecs/vd_lzo.c b/libmpcodecs/vd_lzo.c
index 86640a1568..a2e92a5301 100644
--- a/libmpcodecs/vd_lzo.c
+++ b/libmpcodecs/vd_lzo.c
@@ -5,12 +5,7 @@
 #include "mp_msg.h"
 
 #include "vd_internal.h"
-
-#ifdef USE_LIBAVUTIL_SO
-#include <ffmpeg/lzo.h>
-#else
 #include "libavutil/lzo.h"
-#endif
 
 #define MOD_NAME "DecLZO"
 
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index 552779d7e9..df06bfb81c 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -30,11 +30,7 @@ extern char* passtmpfile;
 
 //===========================================================================//
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#else
 #include "libavcodec/avcodec.h"
-#endif
 
 extern int avcodec_initialized;
 
diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c
index c1759061e6..559f80dd36 100644
--- a/libmpcodecs/ve_xvid4.c
+++ b/libmpcodecs/ve_xvid4.c
@@ -55,12 +55,7 @@
 #include <assert.h>
 
 #include "m_option.h"
-
-#ifdef USE_LIBAVUTIL_SO
-#include <ffmpeg/avutil.h>
-#else
-#include "avutil.h"
-#endif
+#include "libavutil/avutil.h"
 
 #define FINE (!0)
 #define BAD (!FINE)
diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c
index ca8656441c..a7fe6f7529 100644
--- a/libmpcodecs/vf_lavc.c
+++ b/libmpcodecs/vf_lavc.c
@@ -10,12 +10,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#else
 #include "libavcodec/avcodec.h"
-#endif
 
 extern int avcodec_initialized;
 
diff --git a/libmpcodecs/vf_lavcdeint.c b/libmpcodecs/vf_lavcdeint.c
index 271855694b..27d7f96d0b 100644
--- a/libmpcodecs/vf_lavcdeint.c
+++ b/libmpcodecs/vf_lavcdeint.c
@@ -10,12 +10,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#else
 #include "libavcodec/avcodec.h"
-#endif
 
 extern int avcodec_initialized;
 
diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c
index 9b4fe2fc83..cd0a42ac69 100644
--- a/libmpcodecs/vf_pp.c
+++ b/libmpcodecs/vf_pp.c
@@ -15,18 +15,12 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-
-
-#ifdef USE_LIBPOSTPROC_SO
-#include <postproc/postprocess.h>
-#elif defined(USE_LIBPOSTPROC)
-#define EMU_OLD
 #include "libpostproc/postprocess.h"
 
-#ifdef EMU_OLD
+#ifdef USE_LIBPOSTPROC_A
+#define EMU_OLD
 #include "libpostproc/postprocess_internal.h"
 #endif
-#endif
 
 struct vf_priv_s {
     int pp;
diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c
index f9e624a1d0..c7666a9e9d 100644
--- a/libmpcodecs/vf_sab.c
+++ b/libmpcodecs/vf_sab.c
@@ -29,11 +29,7 @@
 #include <malloc.h>
 #endif
 
-#ifdef USE_LIBAVUTIL_SO
-#include <ffmpeg/avutil.h>
-#else
-#include "avutil.h"
-#endif
+#include "libavutil/avutil.h"
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c
index 43e731db5e..56e0eb0d9a 100644
--- a/libmpcodecs/vf_screenshot.c
+++ b/libmpcodecs/vf_screenshot.c
@@ -20,12 +20,7 @@
 #include "vf_scale.h"
 
 #include "libswscale/swscale.h"
-
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#else
 #include "libavcodec/avcodec.h"
-#endif
 
 struct vf_priv_s {
     int frameno;
diff --git a/libmpcodecs/vf_smartblur.c b/libmpcodecs/vf_smartblur.c
index 2332f97a0f..d8ca762552 100644
--- a/libmpcodecs/vf_smartblur.c
+++ b/libmpcodecs/vf_smartblur.c
@@ -29,11 +29,7 @@
 #include <malloc.h>
 #endif
 
-#ifdef USE_LIBAVUTIL_SO
-#include <ffmpeg/avutil.h>
-#else
-#include "avutil.h"
-#endif
+#include "libavutil/avutil.h"
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"