29 files changed, 28 insertions, 144 deletions

diff --git a/configure b/configure
index b5d6e8eed5..3a97b162e8 100755
--- a/configure
+++ b/configure
@@ -6363,7 +6363,7 @@ if test "$_libavutil_a" = auto ; then
 elif test "$_libavutil_so" = auto ; then
   _libavutil_so=no
   cat > $TMPC << EOF
-#include <ffmpeg/common.h>
+#include <libavutil/common.h>
 int main(void) { ff_gcd(1,1); return 0; }
 EOF
   if $_pkg_config --exists libavutil ; then
@@ -6402,7 +6402,7 @@ elif test "$_libavcodec_so" = auto ; then
   _libavcodec_so=no
   _res_comment="libavcodec.so is discouraged over static libavcodec"
   cat > $TMPC << EOF
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
 int main(void) { avcodec_find_encoder_by_name(""); return 0; }
 EOF
   if $_pkg_config --exists libavcodec ; then
@@ -6445,8 +6445,8 @@ if test "$_libavformat_a" = auto ; then
 elif test "$_libavformat_so" = auto ; then
   _libavformat_so=no
   cat > $TMPC <<EOF
-  #include <ffmpeg/avformat.h>
-  #include <ffmpeg/opt.h>
+  #include <libavformat/avformat.h>
+  #include <libavcodec/opt.h>
   int main(void) { av_alloc_format_context(); return 0; }
 EOF
   if $_pkg_config --exists libavformat ; then
@@ -6483,7 +6483,7 @@ elif test "$_libpostproc_so" = auto ; then
   cat > $TMPC << EOF
   #define USE_LIBPOSTPROC 1
   #include <inttypes.h>
-  #include <postproc/postprocess.h>
+  #include <libpostproc/postprocess.h>
   int main(void) { pp_get_mode_by_name_and_quality("de", 0); return 0; }
 EOF
   if cc_check -lpostproc $_ld_lm ; then
diff --git a/fmt-conversion.h b/fmt-conversion.h
index adbf7a028b..86121f584d 100644
--- a/fmt-conversion.h
+++ b/fmt-conversion.h
@@ -1,11 +1,7 @@
 #ifndef MPLAYER_FMT_CONVERSION_H
 #define MPLAYER_FMT_CONVERSION_H
 
-#ifdef USE_LIBAVUTIL_SO
-#include <ffmpeg/avutil.h>
-#else
-#include "avutil.h"
-#endif
+#include "libavutil/avutil.h"
 #include "img_format.h"
 
 enum PixelFormat imgfmt2pixfmt(int fmt)
diff --git a/gui/bitmap.c b/gui/bitmap.c
index f81e3e74ac..fb9023dc34 100644
--- a/gui/bitmap.c
+++ b/gui/bitmap.c
@@ -5,11 +5,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "bitmap.h"
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#else
 #include "libavcodec/avcodec.h"
-#endif
 #include "libavutil/intreadwrite.h"
 #include "libvo/fastmemcpy.h"
 
diff --git a/libaf/af_lavcresample.c b/libaf/af_lavcresample.c
index ef54597b50..fc7ee808a1 100644
--- a/libaf/af_lavcresample.c
+++ b/libaf/af_lavcresample.c
@@ -25,14 +25,8 @@
 
 #include "config.h"
 #include "af.h"
-
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/rational.h>
-#else
-#include "avcodec.h"
-#include "rational.h"
-#endif
+#include "libavcodec/avcodec.h"
+#include "libavutil/rational.h"
 
 // Data for specific instances of this filter
 typedef struct af_resample_s{
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"
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index 60697db84f..b23e0f2c4e 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -79,9 +79,7 @@ static void init_priv (struct asf_priv* asf){
   asf->vid_ext_frame_index=-1;
 }
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#elif defined(USE_LIBAVCODEC)
+#ifdef USE_LIBAVCODEC
 #include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index cb447fde58..bd3e0cb8cd 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -31,17 +31,11 @@
 #include "m_option.h"
 #include "libvo/sub.h"
 
-#ifdef USE_LIBAVFORMAT_SO
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avutil.h>
-#include <ffmpeg/opt.h>
-#else
-#include "avformat.h"
-#include "avutil.h"
-#include "avi.h"
-#include "opt.h"
-#endif
-#include "riff.h"
+#include "libavformat/avformat.h"
+#include "libavutil/avutil.h"
+#include "libavformat/avi.h"
+#include "libavcodec/opt.h"
+#include "libavformat/riff.h"
 
 #define PROBE_BUF_SIZE 2048
 
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 33337548b9..70c8b89f4d 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -39,13 +39,8 @@
 #include <zlib.h>
 #endif
 
-#ifdef USE_LIBAVUTIL_SO
-#include <ffmpeg/lzo.h>
-#include <ffmpeg/intreadwrite.h>
-#else
 #include "libavutil/lzo.h"
 #include "libavutil/intreadwrite.h"
-#endif
 #include "libavutil/avstring.h"
 
 static unsigned char sipr_swaps[38][2]={
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index 0d4a114266..7554363b25 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -33,9 +33,7 @@ Video codecs: (supported by RealPlayer8 for Linux)
 #include "demuxer.h"
 #include "stheader.h"
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#elif defined(USE_LIBAVCODEC)
+#ifdef USE_LIBAVCODEC
 #include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h
index d3dde77fd2..89f6002f98 100644
--- a/libmpdemux/demux_rtp_internal.h
+++ b/libmpdemux/demux_rtp_internal.h
@@ -10,9 +10,7 @@ extern "C" {
 #ifndef DEMUXER_H
 #include "demuxer.h"
 #endif
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#elif defined(USE_LIBAVCODEC)
+#ifdef USE_LIBAVCODEC
 #include "libavcodec/avcodec.h"
 #endif
 }
diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c
index 7c14a989bf..46ff28841d 100644
--- a/libmpdemux/demux_viv.c
+++ b/libmpdemux/demux_viv.c
@@ -14,9 +14,7 @@
 #include "demuxer.h"
 #include "stheader.h"
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#elif defined(USE_LIBAVCODEC)
+#ifdef USE_LIBAVCODEC
 #include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index 8a8851573e..8019044ec9 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -17,11 +17,7 @@
 #include "demuxer.h"
 #include "stheader.h"
 #include "m_option.h"
-#ifdef USE_LIBAVFORMAT_SO
-#include <ffmpeg/avformat.h>
-#else
-#include "avformat.h"
-#endif
+#include "libavformat/avformat.h"
 #include "libavutil/avstring.h"
 
 enum PixelFormat imgfmt2pixfmt(int fmt);
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index 311b72d9ed..fe69c7bf84 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -22,9 +22,7 @@
 /* sub_cc (closed captions)*/
 #include "sub_cc.h"
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#elif defined(USE_LIBAVCODEC)
+#ifdef USE_LIBAVCODEC
 #include "libavcodec/avcodec.h"
 #else
 #define FF_INPUT_BUFFER_PADDING_SIZE 8
diff --git a/libvo/vo_md5sum.c b/libvo/vo_md5sum.c
index dacce83f36..29f54a9b5a 100644
--- a/libvo/vo_md5sum.c
+++ b/libvo/vo_md5sum.c
@@ -41,11 +41,7 @@
 #include "video_out_internal.h"
 #include "mplayer.h"			/* for exit_player() */
 #include "help_mp.h"
-#ifdef USE_LIBAVUTIL_SO
-#include "ffmpeg/md5.h"
-#else
 #include "libavutil/md5.h"
-#endif
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/mencoder.c b/mencoder.c
index dc0efa974d..9cf7de10cc 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -84,10 +84,8 @@
 #include "stream/stream_dvdnav.h"
 #endif
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#elif USE_LIBAVCODEC_A
-#include "avcodec.h"
+#ifdef USE_LIBAVCODEC
+#include "libavcodec/avcodec.h"
 #endif
 
 #include "libmpcodecs/ae.h"
diff --git a/spudec.c b/spudec.c
index cec9a1ab75..78a7865628 100644
--- a/spudec.c
+++ b/spudec.c
@@ -23,11 +23,7 @@
 #include <math.h>
 #include "libvo/video_out.h"
 #include "spudec.h"
-#ifdef USE_LIBAVUTIL_SO
-#include <ffmpeg/avutil.h>
-#else
-#include "avutil.h"
-#endif
+#include "libavutil/avutil.h"
 #include "libswscale/swscale.h"
 
 /* Valid values for spu_aamode:
diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c
index 098946dc5f..f20c92e24e 100644
--- a/stream/realrtsp/real.c
+++ b/stream/realrtsp/real.c
@@ -36,11 +36,7 @@
 #include "asmrp.h"
 #include "sdpplin.h"
 #include "xbuffer.h"
-#if USE_LIBAVUTIL_SO
-#include "ffmpeg/md5.h"
-#else
 #include "libavutil/md5.h"
-#endif
 #include "libavutil/intreadwrite.h"
 #include "../http.h"
 #include "mp_msg.h"