# HG changeset patch
# User diego
# Date 1210334196 0
# Node ID f7cbb7733146ff9703b5fb8c8c2b55adefdd69e7
# Parent  99966715fe75df12e5857a27eabaf128e673b2e2
Use full path for #includes from another directory.

diff -r 99966715fe75 -r f7cbb7733146 ac3dec.c
--- a/ac3dec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ac3dec.c	Fri May 09 11:56:36 2008 +0000
@@ -32,12 +32,12 @@
 #include <math.h>
 #include <string.h>
 
+#include "libavutil/crc.h"
+#include "libavutil/random.h"
 #include "avcodec.h"
 #include "ac3_parser.h"
 #include "bitstream.h"
-#include "crc.h"
 #include "dsputil.h"
-#include "random.h"
 
 /** Maximum possible frame size when the specification limit is ignored */
 #define AC3_MAX_FRAME_SIZE 21695
diff -r 99966715fe75 -r f7cbb7733146 ac3enc.c
--- a/ac3enc.c	Fri May 09 10:44:12 2008 +0000
+++ b/ac3enc.c	Fri May 09 11:56:36 2008 +0000
@@ -25,9 +25,9 @@
  */
 //#define DEBUG
 //#define DEBUG_BITALLOC
+#include "libavutil/crc.h"
 #include "avcodec.h"
 #include "bitstream.h"
-#include "crc.h"
 #include "ac3.h"
 
 typedef struct AC3EncodeContext {
diff -r 99966715fe75 -r f7cbb7733146 ac3tab.h
--- a/ac3tab.h	Fri May 09 10:44:12 2008 +0000
+++ b/ac3tab.h	Fri May 09 11:56:36 2008 +0000
@@ -22,7 +22,7 @@
 #ifndef FFMPEG_AC3TAB_H
 #define FFMPEG_AC3TAB_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 extern const uint16_t ff_ac3_frame_size_tab[38][3];
 extern const uint8_t  ff_ac3_channels_tab[8];
diff -r 99966715fe75 -r f7cbb7733146 alpha/dsputil_alpha.c
--- a/alpha/dsputil_alpha.c	Fri May 09 10:44:12 2008 +0000
+++ b/alpha/dsputil_alpha.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/dsputil.h"
 #include "asm.h"
-#include "dsputil.h"
 
 extern void simple_idct_axp(DCTELEM *block);
 extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block);
diff -r 99966715fe75 -r f7cbb7733146 alpha/motion_est_alpha.c
--- a/alpha/motion_est_alpha.c	Fri May 09 10:44:12 2008 +0000
+++ b/alpha/motion_est_alpha.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/dsputil.h"
 #include "asm.h"
-#include "dsputil.h"
 
 void get_pixels_mvi(DCTELEM *restrict block,
                     const uint8_t *restrict pixels, int line_size)
diff -r 99966715fe75 -r f7cbb7733146 alpha/mpegvideo_alpha.c
--- a/alpha/mpegvideo_alpha.c	Fri May 09 10:44:12 2008 +0000
+++ b/alpha/mpegvideo_alpha.c	Fri May 09 11:56:36 2008 +0000
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 #include "asm.h"
-#include "dsputil.h"
-#include "mpegvideo.h"
 
 static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block,
                                     int n, int qscale)
diff -r 99966715fe75 -r f7cbb7733146 alpha/simple_idct_alpha.c
--- a/alpha/simple_idct_alpha.c	Fri May 09 10:44:12 2008 +0000
+++ b/alpha/simple_idct_alpha.c	Fri May 09 11:56:36 2008 +0000
@@ -26,8 +26,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/dsputil.h"
 #include "asm.h"
-#include "dsputil.h"
 
 extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
                                         int line_size);
diff -r 99966715fe75 -r f7cbb7733146 armv4l/dsputil_arm.c
--- a/armv4l/dsputil_arm.c	Fri May 09 10:44:12 2008 +0000
+++ b/armv4l/dsputil_arm.c	Fri May 09 11:56:36 2008 +0000
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #ifdef HAVE_IPP
 #include <ipp.h>
 #endif
diff -r 99966715fe75 -r f7cbb7733146 armv4l/dsputil_iwmmxt.c
--- a/armv4l/dsputil_iwmmxt.c	Fri May 09 10:44:12 2008 +0000
+++ b/armv4l/dsputil_iwmmxt.c	Fri May 09 11:56:36 2008 +0000
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt
 #define SET_RND(regd)  asm volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12");
diff -r 99966715fe75 -r f7cbb7733146 armv4l/mpegvideo_arm.c
--- a/armv4l/mpegvideo_arm.c	Fri May 09 10:44:12 2008 +0000
+++ b/armv4l/mpegvideo_arm.c	Fri May 09 11:56:36 2008 +0000
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 
 extern void MPV_common_init_iwmmxt(MpegEncContext *s);
 extern void MPV_common_init_armv5te(MpegEncContext *s);
diff -r 99966715fe75 -r f7cbb7733146 armv4l/mpegvideo_armv5te.c
--- a/armv4l/mpegvideo_armv5te.c	Fri May 09 10:44:12 2008 +0000
+++ b/armv4l/mpegvideo_armv5te.c	Fri May 09 11:56:36 2008 +0000
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 
 
 #ifdef ENABLE_ARM_TESTS
diff -r 99966715fe75 -r f7cbb7733146 armv4l/mpegvideo_iwmmxt.c
--- a/armv4l/mpegvideo_iwmmxt.c	Fri May 09 10:44:12 2008 +0000
+++ b/armv4l/mpegvideo_iwmmxt.c	Fri May 09 11:56:36 2008 +0000
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 
 static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s,
                                              DCTELEM *block, int n, int qscale)
diff -r 99966715fe75 -r f7cbb7733146 bethsoftvideo.c
--- a/bethsoftvideo.c	Fri May 09 10:44:12 2008 +0000
+++ b/bethsoftvideo.c	Fri May 09 11:56:36 2008 +0000
@@ -27,7 +27,7 @@
  * @sa http://www.svatopluk.com/andux/docs/dfvid.html
  */
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 #include "bethsoftvideo.h"
 #include "bytestream.h"
diff -r 99966715fe75 -r f7cbb7733146 bfi.c
--- a/bfi.c	Fri May 09 10:44:12 2008 +0000
+++ b/bfi.c	Fri May 09 11:56:36 2008 +0000
@@ -26,8 +26,8 @@
  * @sa http://wiki.multimedia.cx/index.php?title=BFI
  */
 
+#include "libavutil/common.h"
 #include "avcodec.h"
-#include "common.h"
 #include "bytestream.h"
 
 typedef struct BFIContext {
diff -r 99966715fe75 -r f7cbb7733146 bfin/dsputil_bfin.c
--- a/bfin/dsputil_bfin.c	Fri May 09 10:44:12 2008 +0000
+++ b/bfin/dsputil_bfin.c	Fri May 09 11:56:36 2008 +0000
@@ -22,8 +22,8 @@
  */
 
 #include <unistd.h>
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 #include "dsputil_bfin.h"
 
 int off;
diff -r 99966715fe75 -r f7cbb7733146 bfin/mpegvideo_bfin.c
--- a/bfin/mpegvideo_bfin.c	Fri May 09 10:44:12 2008 +0000
+++ b/bfin/mpegvideo_bfin.c	Fri May 09 11:56:36 2008 +0000
@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 #include "dsputil_bfin.h"
 
 
diff -r 99966715fe75 -r f7cbb7733146 bfin/vp3_bfin.c
--- a/bfin/vp3_bfin.c	Fri May 09 10:44:12 2008 +0000
+++ b/bfin/vp3_bfin.c	Fri May 09 11:56:36 2008 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 #include "dsputil_bfin.h"
 
 extern void ff_bfin_vp3_idct (DCTELEM *block) attribute_l1_text;
diff -r 99966715fe75 -r f7cbb7733146 bitstream.h
--- a/bitstream.h	Fri May 09 10:44:12 2008 +0000
+++ b/bitstream.h	Fri May 09 11:56:36 2008 +0000
@@ -29,10 +29,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "common.h"
-#include "bswap.h"
-#include "intreadwrite.h"
-#include "log.h"
+#include "libavutil/bswap.h"
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/log.h"
 
 #if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER)
 #   define ALT_BITSTREAM_READER
diff -r 99966715fe75 -r f7cbb7733146 bytestream.h
--- a/bytestream.h	Fri May 09 10:44:12 2008 +0000
+++ b/bytestream.h	Fri May 09 11:56:36 2008 +0000
@@ -22,7 +22,7 @@
 #ifndef FFMPEG_BYTESTREAM_H
 #define FFMPEG_BYTESTREAM_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 #define DEF_T(type, name, bytes, read, write)                             \
 static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\
diff -r 99966715fe75 -r f7cbb7733146 cabac.c
--- a/cabac.c	Fri May 09 10:44:12 2008 +0000
+++ b/cabac.c	Fri May 09 11:56:36 2008 +0000
@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "bitstream.h"
 #include "cabac.h"
 
diff -r 99966715fe75 -r f7cbb7733146 cabac.h
--- a/cabac.h	Fri May 09 10:44:12 2008 +0000
+++ b/cabac.h	Fri May 09 11:56:36 2008 +0000
@@ -32,7 +32,7 @@
 //#undef NDEBUG
 #include <assert.h>
 #ifdef ARCH_X86
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
 #endif
 
 #define CABAC_BITS 16
diff -r 99966715fe75 -r f7cbb7733146 cook.c
--- a/cook.c	Fri May 09 10:44:12 2008 +0000
+++ b/cook.c	Fri May 09 11:56:36 2008 +0000
@@ -46,11 +46,11 @@
 #include <stddef.h>
 #include <stdio.h>
 
+#include "libavutil/random.h"
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
 #include "bytestream.h"
-#include "random.h"
 
 #include "cookdata.h"
 
diff -r 99966715fe75 -r f7cbb7733146 cscd.c
--- a/cscd.c	Fri May 09 10:44:12 2008 +0000
+++ b/cscd.c	Fri May 09 11:56:36 2008 +0000
@@ -26,7 +26,7 @@
 #ifdef CONFIG_ZLIB
 #include <zlib.h>
 #endif
-#include "lzo.h"
+#include "libavutil/lzo.h"
 
 typedef struct {
     AVFrame pic;
diff -r 99966715fe75 -r f7cbb7733146 dvdata.h
--- a/dvdata.h	Fri May 09 10:44:12 2008 +0000
+++ b/dvdata.h	Fri May 09 11:56:36 2008 +0000
@@ -27,8 +27,8 @@
 #ifndef FFMPEG_DVDATA_H
 #define FFMPEG_DVDATA_H
 
+#include "libavutil/rational.h"
 #include "avcodec.h"
-#include "rational.h"
 
 /*
  * DVprofile is used to express the differences between various
diff -r 99966715fe75 -r f7cbb7733146 elbg.c
--- a/elbg.c	Fri May 09 10:44:12 2008 +0000
+++ b/elbg.c	Fri May 09 11:56:36 2008 +0000
@@ -25,9 +25,9 @@
 
 #include <string.h>
 
+#include "libavutil/random.h"
 #include "elbg.h"
 #include "avcodec.h"
-#include "random.h"
 
 #define DELTA_ERR_MAX 0.1  ///< Precision of the ELBG algorithm (as percentual error)
 
diff -r 99966715fe75 -r f7cbb7733146 elbg.h
--- a/elbg.h	Fri May 09 10:44:12 2008 +0000
+++ b/elbg.h	Fri May 09 11:56:36 2008 +0000
@@ -21,7 +21,7 @@
 #ifndef FFMPEG_ELBG_H
 #define FFMPEG_ELBG_H
 
-#include "random.h"
+#include "libavutil/random.h"
 
 /**
  * Implementation of the Enhanced LBG Algorithm
diff -r 99966715fe75 -r f7cbb7733146 flac.c
--- a/flac.c	Fri May 09 10:44:12 2008 +0000
+++ b/flac.c	Fri May 09 11:56:36 2008 +0000
@@ -36,10 +36,10 @@
 #include <limits.h>
 
 #define ALT_BITSTREAM_READER
+#include "libavutil/crc.h"
 #include "avcodec.h"
 #include "bitstream.h"
 #include "golomb.h"
-#include "crc.h"
 #include "flac.h"
 
 #undef NDEBUG
diff -r 99966715fe75 -r f7cbb7733146 flacenc.c
--- a/flacenc.c	Fri May 09 10:44:12 2008 +0000
+++ b/flacenc.c	Fri May 09 11:56:36 2008 +0000
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/crc.h"
+#include "libavutil/lls.h"
 #include "avcodec.h"
 #include "bitstream.h"
-#include "crc.h"
 #include "dsputil.h"
 #include "golomb.h"
-#include "lls.h"
 
 #define FLAC_MAX_CH  8
 #define FLAC_MIN_BLOCKSIZE  16
diff -r 99966715fe75 -r f7cbb7733146 flicvideo.c
--- a/flicvideo.c	Fri May 09 10:44:12 2008 +0000
+++ b/flicvideo.c	Fri May 09 11:56:36 2008 +0000
@@ -40,8 +40,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "libavutil/bswap.h"
 #include "avcodec.h"
-#include "bswap.h"
 
 #define FLI_256_COLOR 4
 #define FLI_DELTA     7
diff -r 99966715fe75 -r f7cbb7733146 golomb.c
--- a/golomb.c	Fri May 09 10:44:12 2008 +0000
+++ b/golomb.c	Fri May 09 11:56:36 2008 +0000
@@ -26,7 +26,7 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include "common.h"
+#include "libavutil/common.h"
 
 const uint8_t ff_golomb_vlc_len[512]={
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
diff -r 99966715fe75 -r f7cbb7733146 h264data.h
--- a/h264data.h	Fri May 09 10:44:12 2008 +0000
+++ b/h264data.h	Fri May 09 11:56:36 2008 +0000
@@ -30,8 +30,8 @@
 #define FFMPEG_H264DATA_H
 
 #include <stdint.h>
+#include "libavutil/rational.h"
 #include "mpegvideo.h"
-#include "rational.h"
 
 
 #define EXTENDED_SAR          255
diff -r 99966715fe75 -r f7cbb7733146 h264enc.c
--- a/h264enc.c	Fri May 09 10:44:12 2008 +0000
+++ b/h264enc.c	Fri May 09 11:56:36 2008 +0000
@@ -17,7 +17,7 @@
  */
 
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "bitstream.h"
 #include "mpegvideo.h"
 #include "h264data.h"
diff -r 99966715fe75 -r f7cbb7733146 h264pred.h
--- a/h264pred.h	Fri May 09 10:44:12 2008 +0000
+++ b/h264pred.h	Fri May 09 11:56:36 2008 +0000
@@ -28,7 +28,7 @@
 #ifndef FFMPEG_H264PRED_H
 #define FFMPEG_H264PRED_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 /**
  * Prediction types
diff -r 99966715fe75 -r f7cbb7733146 i386/cavsdsp_mmx.c
--- a/i386/cavsdsp_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/cavsdsp_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/cpuid.c
--- a/i386/cpuid.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/cpuid.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/dsputil_mmx.c
--- a/i386/dsputil_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/dsputil_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/dsputil_mmx.h
--- a/i386/dsputil_mmx.h	Fri May 09 10:44:12 2008 +0000
+++ b/i386/dsputil_mmx.h	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/dsputilenc_mmx.c
--- a/i386/dsputilenc_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/dsputilenc_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/fdct_mmx.c
--- a/i386/fdct_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/fdct_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/fft_3dn.c
--- a/i386/fft_3dn.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/fft_3dn.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/fft_3dn2.c
--- a/i386/fft_3dn2.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/fft_3dn2.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/fft_sse.c
--- a/i386/fft_sse.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/fft_sse.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/flacdsp_mmx.c
--- a/i386/flacdsp_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/flacdsp_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/h264_i386.h
--- a/i386/h264_i386.h	Fri May 09 10:44:12 2008 +0000
+++ b/i386/h264_i386.h	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/idct_mmx.c
--- a/i386/idct_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/idct_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/idct_mmx_xvid.c
--- a/i386/idct_mmx_xvid.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/idct_mmx_xvid.c	Fri May 09 11:56:36 2008 +0000
@@ -40,7 +40,7 @@
  */
 
 #include <inttypes.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 
 //=============================================================================
 // Macros and other preprocessor constants
diff -r 99966715fe75 -r f7cbb7733146 i386/idct_sse2_xvid.c
--- a/i386/idct_sse2_xvid.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/idct_sse2_xvid.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/motion_est_mmx.c
--- a/i386/motion_est_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/motion_est_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/mpegvideo_mmx.c
--- a/i386/mpegvideo_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/mpegvideo_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/simple_idct_mmx.c
--- a/i386/simple_idct_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/simple_idct_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/snowdsp_mmx.c
--- a/i386/snowdsp_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/snowdsp_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/vc1dsp_mmx.c
--- a/i386/vc1dsp_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/vc1dsp_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/vp3dsp_mmx.c
--- a/i386/vp3dsp_mmx.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/vp3dsp_mmx.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/vp3dsp_sse2.c
--- a/i386/vp3dsp_sse2.c	Fri May 09 10:44:12 2008 +0000
+++ b/i386/vp3dsp_sse2.c	Fri May 09 11:56:36 2008 +0000
@@ -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 -r 99966715fe75 -r f7cbb7733146 i386/vp3dsp_sse2.h
--- a/i386/vp3dsp_sse2.h	Fri May 09 10:44:12 2008 +0000
+++ b/i386/vp3dsp_sse2.h	Fri May 09 11:56:36 2008 +0000
@@ -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);
diff -r 99966715fe75 -r f7cbb7733146 jfdctfst.c
--- a/jfdctfst.c	Fri May 09 10:44:12 2008 +0000
+++ b/jfdctfst.c	Fri May 09 11:56:36 2008 +0000
@@ -70,7 +70,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 
 #define DCTSIZE 8
diff -r 99966715fe75 -r f7cbb7733146 jfdctint.c
--- a/jfdctint.c	Fri May 09 10:44:12 2008 +0000
+++ b/jfdctint.c	Fri May 09 11:56:36 2008 +0000
@@ -63,7 +63,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 
 #define SHIFT_TEMPS
diff -r 99966715fe75 -r f7cbb7733146 jrevdct.c
--- a/jrevdct.c	Fri May 09 10:44:12 2008 +0000
+++ b/jrevdct.c	Fri May 09 11:56:36 2008 +0000
@@ -64,7 +64,7 @@
  * Independent JPEG Group's LLM idct.
  */
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 
 #define EIGHT_BIT_SAMPLES
diff -r 99966715fe75 -r f7cbb7733146 libtheoraenc.c
--- a/libtheoraenc.c	Fri May 09 10:44:12 2008 +0000
+++ b/libtheoraenc.c	Fri May 09 11:56:36 2008 +0000
@@ -31,8 +31,8 @@
  */
 
 /* FFmpeg includes */
+#include "libavutil/log.h"
 #include "avcodec.h"
-#include "log.h"
 
 /* libtheora includes */
 #include <theora/theora.h>
diff -r 99966715fe75 -r f7cbb7733146 mathops.h
--- a/mathops.h	Fri May 09 10:44:12 2008 +0000
+++ b/mathops.h	Fri May 09 11:56:36 2008 +0000
@@ -22,7 +22,7 @@
 #ifndef FFMPEG_MATHOPS_H
 #define FFMPEG_MATHOPS_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 #ifdef ARCH_X86_32
 
diff -r 99966715fe75 -r f7cbb7733146 mlib/dsputil_mlib.c
--- a/mlib/dsputil_mlib.c	Fri May 09 10:44:12 2008 +0000
+++ b/mlib/dsputil_mlib.c	Fri May 09 11:56:36 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
-#include "mpegvideo.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 
 #include <mlib_types.h>
 #include <mlib_status.h>
diff -r 99966715fe75 -r f7cbb7733146 mlp_parser.c
--- a/mlp_parser.c	Fri May 09 10:44:12 2008 +0000
+++ b/mlp_parser.c	Fri May 09 11:56:36 2008 +0000
@@ -24,9 +24,9 @@
  * MLP parser
  */
 
+#include "libavutil/crc.h"
 #include "bitstream.h"
 #include "parser.h"
-#include "crc.h"
 #include "mlp_parser.h"
 
 static const uint8_t mlp_quants[16] = {
diff -r 99966715fe75 -r f7cbb7733146 mpc.c
--- a/mpc.c	Fri May 09 10:44:12 2008 +0000
+++ b/mpc.c	Fri May 09 11:56:36 2008 +0000
@@ -25,10 +25,10 @@
  * divided into 32 subbands.
  */
 
+#include "libavutil/random.h"
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-#include "random.h"
 
 #ifdef CONFIG_MPEGAUDIO_HP
 #define USE_HIGHPRECISION
diff -r 99966715fe75 -r f7cbb7733146 mpc.h
--- a/mpc.h	Fri May 09 10:44:12 2008 +0000
+++ b/mpc.h	Fri May 09 11:56:36 2008 +0000
@@ -28,10 +28,10 @@
 #ifndef FFMPEG_MPC_H
 #define FFMPEG_MPC_H
 
+#include "libavutil/random.h"
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-#include "random.h"
 
 #ifdef CONFIG_MPEGAUDIO_HP
 #define USE_HIGHPRECISION
diff -r 99966715fe75 -r f7cbb7733146 mpc7.c
--- a/mpc7.c	Fri May 09 10:44:12 2008 +0000
+++ b/mpc7.c	Fri May 09 11:56:36 2008 +0000
@@ -25,10 +25,10 @@
  * divided into 32 subbands.
  */
 
+#include "libavutil/random.h"
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-#include "random.h"
 
 #ifdef CONFIG_MPEGAUDIO_HP
 #define USE_HIGHPRECISION
diff -r 99966715fe75 -r f7cbb7733146 mpc8.c
--- a/mpc8.c	Fri May 09 10:44:12 2008 +0000
+++ b/mpc8.c	Fri May 09 11:56:36 2008 +0000
@@ -25,10 +25,10 @@
  * divided into 32 subbands.
  */
 
+#include "libavutil/random.h"
 #include "avcodec.h"
 #include "bitstream.h"
 #include "dsputil.h"
-#include "random.h"
 
 #ifdef CONFIG_MPEGAUDIO_HP
 #define USE_HIGHPRECISION
diff -r 99966715fe75 -r f7cbb7733146 mpeg12data.h
--- a/mpeg12data.h	Fri May 09 10:44:12 2008 +0000
+++ b/mpeg12data.h	Fri May 09 11:56:36 2008 +0000
@@ -29,7 +29,7 @@
 #define FFMPEG_MPEG12DATA_H
 
 #include <stdint.h>
-#include "rational.h"
+#include "libavutil/rational.h"
 #include "rl.h"
 
 extern const uint16_t ff_mpeg1_default_intra_matrix[64];
diff -r 99966715fe75 -r f7cbb7733146 mpegaudiodata.h
--- a/mpegaudiodata.h	Fri May 09 10:44:12 2008 +0000
+++ b/mpegaudiodata.h	Fri May 09 11:56:36 2008 +0000
@@ -27,7 +27,7 @@
 #ifndef FFMPEG_MPEGAUDIODATA_H
 #define FFMPEG_MPEGAUDIODATA_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 #define MODE_EXT_MS_STEREO 2
 #define MODE_EXT_I_STEREO  1
diff -r 99966715fe75 -r f7cbb7733146 mpegaudiodecheader.h
--- a/mpegaudiodecheader.h	Fri May 09 10:44:12 2008 +0000
+++ b/mpegaudiodecheader.h	Fri May 09 11:56:36 2008 +0000
@@ -27,7 +27,7 @@
 #ifndef FFMPEG_MPEGAUDIODECHEADER_H
 #define FFMPEG_MPEGAUDIODECHEADER_H
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "mpegaudio.h"
 
 
diff -r 99966715fe75 -r f7cbb7733146 msmpeg4data.h
--- a/msmpeg4data.h	Fri May 09 10:44:12 2008 +0000
+++ b/msmpeg4data.h	Fri May 09 11:56:36 2008 +0000
@@ -30,7 +30,7 @@
 #ifndef FFMPEG_MSMPEG4DATA_H
 #define FFMPEG_MSMPEG4DATA_H
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "bitstream.h"
 #include "rl.h"
 
diff -r 99966715fe75 -r f7cbb7733146 nellymoserdec.c
--- a/nellymoserdec.c	Fri May 09 10:44:12 2008 +0000
+++ b/nellymoserdec.c	Fri May 09 11:56:36 2008 +0000
@@ -30,8 +30,9 @@
  * The 3 alphanumeric copyright notices are md5summed they are from the original
  * implementors. The original code is available from http://code.google.com/p/nelly2pcm/
  */
+
+#include "libavutil/random.h"
 #include "avcodec.h"
-#include "random.h"
 #include "dsputil.h"
 
 #define ALT_BITSTREAM_READER_LE
diff -r 99966715fe75 -r f7cbb7733146 nuv.c
--- a/nuv.c	Fri May 09 10:44:12 2008 +0000
+++ b/nuv.c	Fri May 09 11:56:36 2008 +0000
@@ -21,11 +21,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "libavutil/bswap.h"
+#include "libavutil/lzo.h"
 #include "avcodec.h"
-
-#include "bswap.h"
 #include "dsputil.h"
-#include "lzo.h"
 #include "rtjpeg.h"
 
 typedef struct {
diff -r 99966715fe75 -r f7cbb7733146 ppc/dsputil_altivec.c
--- a/ppc/dsputil_altivec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/dsputil_altivec.c	Fri May 09 11:56:36 2008 +0000
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "gcc_fixes.h"
 
diff -r 99966715fe75 -r f7cbb7733146 ppc/dsputil_ppc.c
--- a/ppc/dsputil_ppc.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/dsputil_ppc.c	Fri May 09 11:56:36 2008 +0000
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "dsputil_ppc.h"
 
diff -r 99966715fe75 -r f7cbb7733146 ppc/fdct_altivec.c
--- a/ppc/fdct_altivec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/fdct_altivec.c	Fri May 09 11:56:36 2008 +0000
@@ -20,8 +20,8 @@
  */
 
 
-#include "common.h"
-#include "dsputil.h"
+#include "libavutil/common.h"
+#include "libavcodec/dsputil.h"
 #include "dsputil_ppc.h"
 #include "gcc_fixes.h"
 
diff -r 99966715fe75 -r f7cbb7733146 ppc/fft_altivec.c
--- a/ppc/fft_altivec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/fft_altivec.c	Fri May 09 11:56:36 2008 +0000
@@ -20,7 +20,7 @@
  * 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 "libavcodec/dsputil.h"
 
 #include "gcc_fixes.h"
 
diff -r 99966715fe75 -r f7cbb7733146 ppc/float_altivec.c
--- a/ppc/float_altivec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/float_altivec.c	Fri May 09 11:56:36 2008 +0000
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "gcc_fixes.h"
 
diff -r 99966715fe75 -r f7cbb7733146 ppc/gmc_altivec.c
--- a/ppc/gmc_altivec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/gmc_altivec.c	Fri May 09 11:56:36 2008 +0000
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "gcc_fixes.h"
 
diff -r 99966715fe75 -r f7cbb7733146 ppc/h264_altivec.c
--- a/ppc/h264_altivec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/h264_altivec.c	Fri May 09 11:56:36 2008 +0000
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "gcc_fixes.h"
 
diff -r 99966715fe75 -r f7cbb7733146 ppc/idct_altivec.c
--- a/ppc/idct_altivec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/idct_altivec.c	Fri May 09 11:56:36 2008 +0000
@@ -38,7 +38,7 @@
 
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "gcc_fixes.h"
 
diff -r 99966715fe75 -r f7cbb7733146 ppc/int_altivec.c
--- a/ppc/int_altivec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/int_altivec.c	Fri May 09 11:56:36 2008 +0000
@@ -23,7 +23,7 @@
  ** integer misc ops.
  **/
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "gcc_fixes.h"
 
diff -r 99966715fe75 -r f7cbb7733146 ppc/mpegvideo_altivec.c
--- a/ppc/mpegvideo_altivec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/mpegvideo_altivec.c	Fri May 09 11:56:36 2008 +0000
@@ -23,8 +23,8 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "dsputil.h"
-#include "mpegvideo.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 
 #include "gcc_fixes.h"
 
diff -r 99966715fe75 -r f7cbb7733146 ppc/snow_altivec.c
--- a/ppc/snow_altivec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/snow_altivec.c	Fri May 09 11:56:36 2008 +0000
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/snow.h"
 
 #include "gcc_fixes.h"
 #include "dsputil_altivec.h"
-#include "snow.h"
 
 #undef NDEBUG
 #include <assert.h>
diff -r 99966715fe75 -r f7cbb7733146 ppc/vc1dsp_altivec.c
--- a/ppc/vc1dsp_altivec.c	Fri May 09 10:44:12 2008 +0000
+++ b/ppc/vc1dsp_altivec.c	Fri May 09 11:56:36 2008 +0000
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "gcc_fixes.h"
 
diff -r 99966715fe75 -r f7cbb7733146 ps2/dsputil_mmi.c
--- a/ps2/dsputil_mmi.c	Fri May 09 10:44:12 2008 +0000
+++ b/ps2/dsputil_mmi.c	Fri May 09 11:56:36 2008 +0000
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "mmi.h"
 
 void ff_mmi_idct_put(uint8_t *dest, int line_size, DCTELEM *block);
diff -r 99966715fe75 -r f7cbb7733146 ps2/idct_mmi.c
--- a/ps2/idct_mmi.c	Fri May 09 10:44:12 2008 +0000
+++ b/ps2/idct_mmi.c	Fri May 09 11:56:36 2008 +0000
@@ -25,8 +25,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 "mmi.h"
 
 #define BITS_INV_ACC    5       // 4 or 5 for IEEE
diff -r 99966715fe75 -r f7cbb7733146 ps2/mpegvideo_mmi.c
--- a/ps2/mpegvideo_mmi.c	Fri May 09 10:44:12 2008 +0000
+++ b/ps2/mpegvideo_mmi.c	Fri May 09 11:56:36 2008 +0000
@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
-#include "mpegvideo.h"
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
+#include "libavcodec/mpegvideo.h"
 
 static void dct_unquantize_h263_mmi(MpegEncContext *s,
                                   DCTELEM *block, int n, int qscale)
diff -r 99966715fe75 -r f7cbb7733146 rangecoder.h
--- a/rangecoder.h	Fri May 09 10:44:12 2008 +0000
+++ b/rangecoder.h	Fri May 09 11:56:36 2008 +0000
@@ -29,7 +29,7 @@
 
 #include <stdint.h>
 #include <assert.h>
-#include "common.h"
+#include "libavutil/common.h"
 
 typedef struct RangeCoder{
     int low;
diff -r 99966715fe75 -r f7cbb7733146 rectangle.h
--- a/rectangle.h	Fri May 09 10:44:12 2008 +0000
+++ b/rectangle.h	Fri May 09 11:56:36 2008 +0000
@@ -28,7 +28,7 @@
 #ifndef FFMPEG_RECTANGLE_H
 #define FFMPEG_RECTANGLE_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 /**
  * fill a rectangle.
diff -r 99966715fe75 -r f7cbb7733146 roqvideo.h
--- a/roqvideo.h	Fri May 09 10:44:12 2008 +0000
+++ b/roqvideo.h	Fri May 09 11:56:36 2008 +0000
@@ -22,9 +22,9 @@
 #ifndef FFMPEG_ROQVIDEO_H
 #define FFMPEG_ROQVIDEO_H
 
+#include "libavutil/random.h"
 #include "avcodec.h"
 #include "dsputil.h"
-#include "random.h"
 
 typedef struct {
     unsigned char y[4];
diff -r 99966715fe75 -r f7cbb7733146 rtjpeg.c
--- a/rtjpeg.c	Fri May 09 10:44:12 2008 +0000
+++ b/rtjpeg.c	Fri May 09 11:56:36 2008 +0000
@@ -18,7 +18,7 @@
  * 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 "libavutil/common.h"
 #include "bitstream.h"
 #include "dsputil.h"
 #include "rtjpeg.h"
diff -r 99966715fe75 -r f7cbb7733146 sh4/dsputil_align.c
--- a/sh4/dsputil_align.c	Fri May 09 10:44:12 2008 +0000
+++ b/sh4/dsputil_align.c	Fri May 09 11:56:36 2008 +0000
@@ -21,8 +21,8 @@
  */
 
 
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 
 
 #define         LP(p)           *(uint32_t*)(p)
diff -r 99966715fe75 -r f7cbb7733146 sh4/dsputil_sh4.c
--- a/sh4/dsputil_sh4.c	Fri May 09 10:44:12 2008 +0000
+++ b/sh4/dsputil_sh4.c	Fri May 09 11:56:36 2008 +0000
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 
 static void memzero_align8(void *dst,size_t size)
 {
diff -r 99966715fe75 -r f7cbb7733146 sh4/idct_sh4.c
--- a/sh4/idct_sh4.c	Fri May 09 10:44:12 2008 +0000
+++ b/sh4/idct_sh4.c	Fri May 09 11:56:36 2008 +0000
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #define c1      1.38703984532214752434  /* sqrt(2)*cos(1*pi/16) */
 #define c2      1.30656296487637657577  /* sqrt(2)*cos(2*pi/16) */
 #define c3      1.17587560241935884520  /* sqrt(2)*cos(3*pi/16) */
diff -r 99966715fe75 -r f7cbb7733146 sparc/dsputil_vis.c
--- a/sparc/dsputil_vis.c	Fri May 09 10:44:12 2008 +0000
+++ b/sparc/dsputil_vis.c	Fri May 09 11:56:36 2008 +0000
@@ -27,7 +27,7 @@
 
 #include <inttypes.h>
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "vis.h"
 
diff -r 99966715fe75 -r f7cbb7733146 sparc/simple_idct_vis.c
--- a/sparc/simple_idct_vis.c	Fri May 09 10:44:12 2008 +0000
+++ b/sparc/simple_idct_vis.c	Fri May 09 11:56:36 2008 +0000
@@ -22,7 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 static const DECLARE_ALIGNED_8(int16_t, coeffs[28]) = {
     - 1259,- 1259,- 1259,- 1259,
diff -r 99966715fe75 -r f7cbb7733146 utils.c
--- a/utils.c	Fri May 09 10:44:12 2008 +0000
+++ b/utils.c	Fri May 09 11:56:36 2008 +0000
@@ -25,11 +25,11 @@
  * utils.
  */
 
+#include "libavutil/integer.h"
+#include "libavutil/crc.h"
 #include "avcodec.h"
 #include "dsputil.h"
-#include "integer.h"
 #include "opt.h"
-#include "crc.h"
 #include "imgconvert.h"
 #include <stdarg.h>
 #include <limits.h>
diff -r 99966715fe75 -r f7cbb7733146 vc1data.h
--- a/vc1data.h	Fri May 09 10:44:12 2008 +0000
+++ b/vc1data.h	Fri May 09 11:56:36 2008 +0000
@@ -29,8 +29,8 @@
 #define FFMPEG_VC1DATA_H
 
 #include <stdint.h>
+#include "libavutil/rational.h"
 #include "bitstream.h"
-#include "rational.h"
 
 /** Table for conversion between TTBLK and TTMB */
 extern const int ff_vc1_ttblk_to_tt[3][8];
diff -r 99966715fe75 -r f7cbb7733146 vp56data.h
--- a/vp56data.h	Fri May 09 10:44:12 2008 +0000
+++ b/vp56data.h	Fri May 09 11:56:36 2008 +0000
@@ -24,7 +24,7 @@
 #ifndef FFMPEG_VP56DATA_H
 #define FFMPEG_VP56DATA_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 typedef enum {
     VP56_FRAME_CURRENT  = 0,
diff -r 99966715fe75 -r f7cbb7733146 xiph.h
--- a/xiph.h	Fri May 09 10:44:12 2008 +0000
+++ b/xiph.h	Fri May 09 11:56:36 2008 +0000
@@ -21,7 +21,7 @@
 #ifndef FFMPEG_XIPH_H
 #define FFMPEG_XIPH_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 /**
  * Splits a single extradata buffer into the three headers that most