# HG changeset patch
# User diego
# Date 1203954396 0
# Node ID 1318e956c0926131f174d9f50ff712c3627aa211
# Parent  bfada3b4c366a0adbd620f2aa06b398e19669c44
FFmpeg now uses different (unified) #include paths.

diff -r bfada3b4c366 -r 1318e956c092 configure
--- a/configure	Mon Feb 25 09:45:55 2008 +0000
+++ b/configure	Mon Feb 25 15:46:36 2008 +0000
@@ -6363,7 +6363,7 @@
 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 @@
   _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 @@
 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 @@
   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 -r bfada3b4c366 -r 1318e956c092 fmt-conversion.h
--- a/fmt-conversion.h	Mon Feb 25 09:45:55 2008 +0000
+++ b/fmt-conversion.h	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 gui/bitmap.c
--- a/gui/bitmap.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/gui/bitmap.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libaf/af_lavcresample.c
--- a/libaf/af_lavcresample.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libaf/af_lavcresample.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/ad_ffmpeg.c
--- a/libmpcodecs/ad_ffmpeg.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/ad_ffmpeg.c	Mon Feb 25 15:46:36 2008 +0000
@@ -24,11 +24,7 @@
 
 #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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/ae_lavc.c
--- a/libmpcodecs/ae_lavc.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/ae_lavc.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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  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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/native/nuppelvideo.c
--- a/libmpcodecs/native/nuppelvideo.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/native/nuppelvideo.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/vd_ffmpeg.c
--- a/libmpcodecs/vd_ffmpeg.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Mon Feb 25 15:46:36 2008 +0000
@@ -23,11 +23,7 @@
 
 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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/vd_lzo.c
--- a/libmpcodecs/vd_lzo.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/vd_lzo.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/ve_lavc.c
--- a/libmpcodecs/ve_lavc.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/ve_lavc.c	Mon Feb 25 15:46:36 2008 +0000
@@ -30,11 +30,7 @@
 
 //===========================================================================//
 
-#ifdef USE_LIBAVCODEC_SO
-#include <ffmpeg/avcodec.h>
-#else
 #include "libavcodec/avcodec.h"
-#endif
 
 extern int avcodec_initialized;
 
diff -r bfada3b4c366 -r 1318e956c092 libmpcodecs/ve_xvid4.c
--- a/libmpcodecs/ve_xvid4.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/ve_xvid4.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/vf_lavc.c
--- a/libmpcodecs/vf_lavc.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/vf_lavc.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/vf_lavcdeint.c
--- a/libmpcodecs/vf_lavcdeint.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/vf_lavcdeint.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/vf_pp.c
--- a/libmpcodecs/vf_pp.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/vf_pp.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/vf_sab.c
--- a/libmpcodecs/vf_sab.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/vf_sab.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/vf_screenshot.c
--- a/libmpcodecs/vf_screenshot.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/vf_screenshot.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpcodecs/vf_smartblur.c
--- a/libmpcodecs/vf_smartblur.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpcodecs/vf_smartblur.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpdemux/demux_asf.c
--- a/libmpdemux/demux_asf.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpdemux/demux_asf.c	Mon Feb 25 15:46:36 2008 +0000
@@ -79,9 +79,7 @@
   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 -r bfada3b4c366 -r 1318e956c092 libmpdemux/demux_lavf.c
--- a/libmpdemux/demux_lavf.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpdemux/demux_lavf.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpdemux/demux_mkv.c
--- a/libmpdemux/demux_mkv.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpdemux/demux_mkv.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpdemux/demux_real.c
--- a/libmpdemux/demux_real.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpdemux/demux_real.c	Mon Feb 25 15:46:36 2008 +0000
@@ -33,9 +33,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 -r bfada3b4c366 -r 1318e956c092 libmpdemux/demux_rtp_internal.h
--- a/libmpdemux/demux_rtp_internal.h	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpdemux/demux_rtp_internal.h	Mon Feb 25 15:46:36 2008 +0000
@@ -10,9 +10,7 @@
 #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 -r bfada3b4c366 -r 1318e956c092 libmpdemux/demux_viv.c
--- a/libmpdemux/demux_viv.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpdemux/demux_viv.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpdemux/muxer_lavf.c
--- a/libmpdemux/muxer_lavf.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpdemux/muxer_lavf.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libmpdemux/video.c
--- a/libmpdemux/video.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libmpdemux/video.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 libvo/vo_md5sum.c
--- a/libvo/vo_md5sum.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/libvo/vo_md5sum.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 mencoder.c
--- a/mencoder.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/mencoder.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 spudec.c
--- a/spudec.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/spudec.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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 -r bfada3b4c366 -r 1318e956c092 stream/realrtsp/real.c
--- a/stream/realrtsp/real.c	Mon Feb 25 09:45:55 2008 +0000
+++ b/stream/realrtsp/real.c	Mon Feb 25 15:46:36 2008 +0000
@@ -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"