Use full path for #includes from another directory.

Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk

22 files changed, 49 insertions, 45 deletions

diff --git a/libavcodec/i386/cavsdsp_mmx.c b/libavcodec/i386/cavsdsp_mmx.c
index 618c60dce6..7489630eeb 100644
--- a/libavcodec/i386/cavsdsp_mmx.c
+++ b/libavcodec/i386/cavsdsp_mmx.c
@@ -22,10 +22,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavutil/common.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
 #include "dsputil_mmx.h"
-#include "common.h"
-#include "x86_cpu.h"
 
 /*****************************************************************************
  *
diff --git a/libavcodec/i386/cpuid.c b/libavcodec/i386/cpuid.c
index a07749d1d3..230ff26c0b 100644
--- a/libavcodec/i386/cpuid.c
+++ b/libavcodec/i386/cpuid.c
@@ -21,8 +21,8 @@
  */
 
 #include <stdlib.h>
-#include "dsputil.h"
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
 
 #undef printf
 
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index b8beddded9..53cfe9d848 100644
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -22,16 +22,16 @@
  * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
  */
 
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/h263.h"
+#include "libavcodec/mpegvideo.h"
+#include "libavcodec/simple_idct.h"
 #include "dsputil_mmx.h"
-#include "simple_idct.h"
-#include "mpegvideo.h"
-#include "x86_cpu.h"
 #include "mmx.h"
 #include "vp3dsp_mmx.h"
 #include "vp3dsp_sse2.h"
 #include "idct_xvid.h"
-#include "h263.h"
 
 //#undef NDEBUG
 //#include <assert.h>
diff --git a/libavcodec/i386/dsputil_mmx.h b/libavcodec/i386/dsputil_mmx.h
index 81fe54e234..142854684b 100644
--- a/libavcodec/i386/dsputil_mmx.h
+++ b/libavcodec/i386/dsputil_mmx.h
@@ -23,7 +23,7 @@
 #define FFMPEG_DSPUTIL_MMX_H
 
 #include <stdint.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 typedef struct { uint64_t a, b; } xmm_t;
 
diff --git a/libavcodec/i386/dsputilenc_mmx.c b/libavcodec/i386/dsputilenc_mmx.c
index 733234a1f1..94e189cb6f 100644
--- a/libavcodec/i386/dsputilenc_mmx.c
+++ b/libavcodec/i386/dsputilenc_mmx.c
@@ -22,10 +22,10 @@
  * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
  */
 
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 #include "dsputil_mmx.h"
-#include "mpegvideo.h"
-#include "x86_cpu.h"
 
 
 static void get_pixels_mmx(DCTELEM *block, const uint8_t *pixels, int line_size)
diff --git a/libavcodec/i386/fdct_mmx.c b/libavcodec/i386/fdct_mmx.c
index f93c3c9375..9e017a656a 100644
--- a/libavcodec/i386/fdct_mmx.c
+++ b/libavcodec/i386/fdct_mmx.c
@@ -29,8 +29,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "common.h"
-#include "dsputil.h"
+
+#include "libavutil/common.h"
+#include "libavcodec/dsputil.h"
 #include "mmx.h"
 
 #define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))
diff --git a/libavcodec/i386/fft_3dn.c b/libavcodec/i386/fft_3dn.c
index 700a1e4bae..8bd7b89d01 100644
--- a/libavcodec/i386/fft_3dn.c
+++ b/libavcodec/i386/fft_3dn.c
@@ -19,8 +19,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
 
 static const int p1m1[2] __attribute__((aligned(8))) =
     { 0, 1 << 31 };
diff --git a/libavcodec/i386/fft_3dn2.c b/libavcodec/i386/fft_3dn2.c
index c5337b8c2a..32c4be369b 100644
--- a/libavcodec/i386/fft_3dn2.c
+++ b/libavcodec/i386/fft_3dn2.c
@@ -19,8 +19,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
 
 static const int p1m1[2] __attribute__((aligned(8))) =
     { 0, 1 << 31 };
diff --git a/libavcodec/i386/fft_sse.c b/libavcodec/i386/fft_sse.c
index 3a0f2d7427..83cbd87088 100644
--- a/libavcodec/i386/fft_sse.c
+++ b/libavcodec/i386/fft_sse.c
@@ -18,8 +18,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
 
 static const int p1p1p1m1[4] __attribute__((aligned(16))) =
     { 0, 0, 0, 1 << 31 };
diff --git a/libavcodec/i386/flacdsp_mmx.c b/libavcodec/i386/flacdsp_mmx.c
index 2096e3305b..ad248ff944 100644
--- a/libavcodec/i386/flacdsp_mmx.c
+++ b/libavcodec/i386/flacdsp_mmx.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/x86_cpu.h"
 #include "dsputil_mmx.h"
-#include "x86_cpu.h"
 
 static void apply_welch_window_sse2(const int32_t *data, int len, double *w_data)
 {
diff --git a/libavcodec/i386/h264_i386.h b/libavcodec/i386/h264_i386.h
index b2dc5e8ee1..80468f68c9 100644
--- a/libavcodec/i386/h264_i386.h
+++ b/libavcodec/i386/h264_i386.h
@@ -29,8 +29,7 @@
 #ifndef FFMPEG_H264_I386_H
 #define FFMPEG_H264_I386_H
 
-
-#include "cabac.h"
+#include "libavcodec/cabac.h"
 
 //FIXME use some macros to avoid duplicating get_cabac (cannot be done yet
 //as that would make optimization work hard)
diff --git a/libavcodec/i386/idct_mmx.c b/libavcodec/i386/idct_mmx.c
index 005a42dedb..d860c7e381 100644
--- a/libavcodec/i386/idct_mmx.c
+++ b/libavcodec/i386/idct_mmx.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "common.h"
-#include "dsputil.h"
+#include "libavutil/common.h"
+#include "libavcodec/dsputil.h"
 
 #include "mmx.h"
 
diff --git a/libavcodec/i386/idct_mmx_xvid.c b/libavcodec/i386/idct_mmx_xvid.c
index 15e5290e7b..9f90b5d8fd 100644
--- a/libavcodec/i386/idct_mmx_xvid.c
+++ b/libavcodec/i386/idct_mmx_xvid.c
@@ -40,7 +40,7 @@
  */
 
 #include <inttypes.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 
 //=============================================================================
 // Macros and other preprocessor constants
diff --git a/libavcodec/i386/idct_sse2_xvid.c b/libavcodec/i386/idct_sse2_xvid.c
index 9029af183f..95bdc05772 100644
--- a/libavcodec/i386/idct_sse2_xvid.c
+++ b/libavcodec/i386/idct_sse2_xvid.c
@@ -38,7 +38,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 /*!
  * @file idct_sse2_xvid.c
diff --git a/libavcodec/i386/motion_est_mmx.c b/libavcodec/i386/motion_est_mmx.c
index df75b6e153..0e111f9f97 100644
--- a/libavcodec/i386/motion_est_mmx.c
+++ b/libavcodec/i386/motion_est_mmx.c
@@ -21,8 +21,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "dsputil.h"
-#include "x86_cpu.h"
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
 
 DECLARE_ASM_CONST(8, uint64_t, round_tab[3])={
 0x0000000000000000ULL,
diff --git a/libavcodec/i386/mpegvideo_mmx.c b/libavcodec/i386/mpegvideo_mmx.c
index 4b2e4d68af..b7ed74d270 100644
--- a/libavcodec/i386/mpegvideo_mmx.c
+++ b/libavcodec/i386/mpegvideo_mmx.c
@@ -22,11 +22,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 #include "dsputil_mmx.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
-#include "x86_cpu.h"
 
 extern uint16_t inv_zigzag_direct16[64];
 
diff --git a/libavcodec/i386/simple_idct_mmx.c b/libavcodec/i386/simple_idct_mmx.c
index 059f473a0c..04b28f50c1 100644
--- a/libavcodec/i386/simple_idct_mmx.c
+++ b/libavcodec/i386/simple_idct_mmx.c
@@ -19,8 +19,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "dsputil.h"
-#include "simple_idct.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/simple_idct.h"
 
 /*
 23170.475006
diff --git a/libavcodec/i386/snowdsp_mmx.c b/libavcodec/i386/snowdsp_mmx.c
index c9671f0c1e..2fb76cf0d4 100644
--- a/libavcodec/i386/snowdsp_mmx.c
+++ b/libavcodec/i386/snowdsp_mmx.c
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avcodec.h"
-#include "snow.h"
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/snow.h"
 
 void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width){
     const int w2= (width+1)>>1;
diff --git a/libavcodec/i386/vc1dsp_mmx.c b/libavcodec/i386/vc1dsp_mmx.c
index 0e543e4fde..c3df9415ea 100644
--- a/libavcodec/i386/vc1dsp_mmx.c
+++ b/libavcodec/i386/vc1dsp_mmx.c
@@ -24,9 +24,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dsputil.h"
 #include "dsputil_mmx.h"
-#include "x86_cpu.h"
 
 /** Add rounder from mm7 to mm3 and pack result at destination */
 #define NORMALIZE_MMX(SHIFT)                                    \
diff --git a/libavcodec/i386/vp3dsp_mmx.c b/libavcodec/i386/vp3dsp_mmx.c
index d71a2b4141..00a6d27207 100644
--- a/libavcodec/i386/vp3dsp_mmx.c
+++ b/libavcodec/i386/vp3dsp_mmx.c
@@ -23,7 +23,7 @@
  * MMX-optimized functions cribbed from the original VP3 source code.
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "mmx.h"
 
 #define IdctAdjustBeforeShift 8
diff --git a/libavcodec/i386/vp3dsp_sse2.c b/libavcodec/i386/vp3dsp_sse2.c
index 1950407eee..e888bcfd69 100644
--- a/libavcodec/i386/vp3dsp_sse2.c
+++ b/libavcodec/i386/vp3dsp_sse2.c
@@ -23,7 +23,7 @@
  * SSE2-optimized functions cribbed from the original VP3 source code.
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "mmx.h"
 
 static DECLARE_ALIGNED_16(const unsigned short, SSE2_dequant_const[]) =
diff --git a/libavcodec/i386/vp3dsp_sse2.h b/libavcodec/i386/vp3dsp_sse2.h
index d02918f459..a421abc9ae 100644
--- a/libavcodec/i386/vp3dsp_sse2.h
+++ b/libavcodec/i386/vp3dsp_sse2.h
@@ -22,7 +22,7 @@
 #ifndef FFMPEG_VP3DSP_SSE2_H
 #define FFMPEG_VP3DSP_SSE2_H
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 void ff_vp3_idct_sse2(int16_t *input_data);
 void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);