Fri May 9 13:56:36 CEST 2008

Author: diego
Date: Fri May  9 13:56:36 2008
New Revision: 13098

Log:
Use full path for #includes from another directory.


Modified:
   trunk/cmdutils.c
   trunk/ffmpeg.c
   trunk/ffplay.c
   trunk/ffserver.c
   trunk/libavcodec/ac3dec.c
   trunk/libavcodec/ac3enc.c
   trunk/libavcodec/ac3tab.h
   trunk/libavcodec/alpha/dsputil_alpha.c
   trunk/libavcodec/alpha/motion_est_alpha.c
   trunk/libavcodec/alpha/mpegvideo_alpha.c
   trunk/libavcodec/alpha/simple_idct_alpha.c
   trunk/libavcodec/armv4l/dsputil_arm.c
   trunk/libavcodec/armv4l/dsputil_iwmmxt.c
   trunk/libavcodec/armv4l/mpegvideo_arm.c
   trunk/libavcodec/armv4l/mpegvideo_armv5te.c
   trunk/libavcodec/armv4l/mpegvideo_iwmmxt.c
   trunk/libavcodec/bethsoftvideo.c
   trunk/libavcodec/bfi.c
   trunk/libavcodec/bfin/dsputil_bfin.c
   trunk/libavcodec/bfin/mpegvideo_bfin.c
   trunk/libavcodec/bfin/vp3_bfin.c
   trunk/libavcodec/bitstream.h
   trunk/libavcodec/bytestream.h
   trunk/libavcodec/cabac.c
   trunk/libavcodec/cabac.h
   trunk/libavcodec/cook.c
   trunk/libavcodec/cscd.c
   trunk/libavcodec/dvdata.h
   trunk/libavcodec/elbg.c
   trunk/libavcodec/elbg.h
   trunk/libavcodec/flac.c
   trunk/libavcodec/flacenc.c
   trunk/libavcodec/flicvideo.c
   trunk/libavcodec/golomb.c
   trunk/libavcodec/h264data.h
   trunk/libavcodec/h264enc.c
   trunk/libavcodec/h264pred.h
   trunk/libavcodec/i386/cavsdsp_mmx.c
   trunk/libavcodec/i386/cpuid.c
   trunk/libavcodec/i386/dsputil_mmx.c
   trunk/libavcodec/i386/dsputil_mmx.h
   trunk/libavcodec/i386/dsputilenc_mmx.c
   trunk/libavcodec/i386/fdct_mmx.c
   trunk/libavcodec/i386/fft_3dn.c
   trunk/libavcodec/i386/fft_3dn2.c
   trunk/libavcodec/i386/fft_sse.c
   trunk/libavcodec/i386/flacdsp_mmx.c
   trunk/libavcodec/i386/h264_i386.h
   trunk/libavcodec/i386/idct_mmx.c
   trunk/libavcodec/i386/idct_mmx_xvid.c
   trunk/libavcodec/i386/idct_sse2_xvid.c
   trunk/libavcodec/i386/motion_est_mmx.c
   trunk/libavcodec/i386/mpegvideo_mmx.c
   trunk/libavcodec/i386/simple_idct_mmx.c
   trunk/libavcodec/i386/snowdsp_mmx.c
   trunk/libavcodec/i386/vc1dsp_mmx.c
   trunk/libavcodec/i386/vp3dsp_mmx.c
   trunk/libavcodec/i386/vp3dsp_sse2.c
   trunk/libavcodec/i386/vp3dsp_sse2.h
   trunk/libavcodec/jfdctfst.c
   trunk/libavcodec/jfdctint.c
   trunk/libavcodec/jrevdct.c
   trunk/libavcodec/libtheoraenc.c
   trunk/libavcodec/mathops.h
   trunk/libavcodec/mlib/dsputil_mlib.c
   trunk/libavcodec/mlp_parser.c
   trunk/libavcodec/mpc.c
   trunk/libavcodec/mpc.h
   trunk/libavcodec/mpc7.c
   trunk/libavcodec/mpc8.c
   trunk/libavcodec/mpeg12data.h
   trunk/libavcodec/mpegaudiodata.h
   trunk/libavcodec/mpegaudiodecheader.h
   trunk/libavcodec/msmpeg4data.h
   trunk/libavcodec/nellymoserdec.c
   trunk/libavcodec/nuv.c
   trunk/libavcodec/ppc/dsputil_altivec.c
   trunk/libavcodec/ppc/dsputil_ppc.c
   trunk/libavcodec/ppc/fdct_altivec.c
   trunk/libavcodec/ppc/fft_altivec.c
   trunk/libavcodec/ppc/float_altivec.c
   trunk/libavcodec/ppc/gmc_altivec.c
   trunk/libavcodec/ppc/h264_altivec.c
   trunk/libavcodec/ppc/idct_altivec.c
   trunk/libavcodec/ppc/int_altivec.c
   trunk/libavcodec/ppc/mpegvideo_altivec.c
   trunk/libavcodec/ppc/snow_altivec.c
   trunk/libavcodec/ppc/vc1dsp_altivec.c
   trunk/libavcodec/ps2/dsputil_mmi.c
   trunk/libavcodec/ps2/idct_mmi.c
   trunk/libavcodec/ps2/mpegvideo_mmi.c
   trunk/libavcodec/rangecoder.h
   trunk/libavcodec/rectangle.h
   trunk/libavcodec/roqvideo.h
   trunk/libavcodec/rtjpeg.c
   trunk/libavcodec/sh4/dsputil_align.c
   trunk/libavcodec/sh4/dsputil_sh4.c
   trunk/libavcodec/sh4/idct_sh4.c
   trunk/libavcodec/sparc/dsputil_vis.c
   trunk/libavcodec/sparc/simple_idct_vis.c
   trunk/libavcodec/utils.c
   trunk/libavcodec/vc1data.h
   trunk/libavcodec/vp56data.h
   trunk/libavcodec/xiph.h
   trunk/libavdevice/alldevices.c
   trunk/libavdevice/audio.c
   trunk/libavdevice/beosaudio.cpp
   trunk/libavdevice/bktr.c
   trunk/libavdevice/dv1394.c
   trunk/libavdevice/libdc1394.c
   trunk/libavdevice/v4l.c
   trunk/libavdevice/v4l2.c
   trunk/libavdevice/vfwcap.c
   trunk/libavdevice/x11grab.c
   trunk/libavfilter/avfilter.c
   trunk/libavfilter/avfilter.h
   trunk/libavfilter/defaults.c
   trunk/libavformat/adtsenc.c
   trunk/libavformat/aiff.c
   trunk/libavformat/asf.c
   trunk/libavformat/asfcrypt.c
   trunk/libavformat/avio.c
   trunk/libavformat/aviobuf.c
   trunk/libavformat/bethsoftvid.c
   trunk/libavformat/crcenc.c
   trunk/libavformat/dv.c
   trunk/libavformat/dvenc.c
   trunk/libavformat/file.c
   trunk/libavformat/framecrcenc.c
   trunk/libavformat/framehook.h
   trunk/libavformat/gif.c
   trunk/libavformat/gxf.c
   trunk/libavformat/gxfenc.c
   trunk/libavformat/http.c
   trunk/libavformat/img2.c
   trunk/libavformat/matroska.h
   trunk/libavformat/matroskadec.c
   trunk/libavformat/matroskaenc.c
   trunk/libavformat/mov.c
   trunk/libavformat/mp3.c
   trunk/libavformat/mpc.c
   trunk/libavformat/mpc8.c
   trunk/libavformat/mpeg.h
   trunk/libavformat/mpegenc.c
   trunk/libavformat/mpegts.c
   trunk/libavformat/mpegtsenc.c
   trunk/libavformat/msnwc_tcp.c
   trunk/libavformat/mtv.c
   trunk/libavformat/mxf.c
   trunk/libavformat/nut.c
   trunk/libavformat/nut.h
   trunk/libavformat/nutdec.c
   trunk/libavformat/nutenc.c
   trunk/libavformat/oggenc.c
   trunk/libavformat/oggparseflac.c
   trunk/libavformat/oggparseogm.c
   trunk/libavformat/oggparsespeex.c
   trunk/libavformat/oggparsetheora.c
   trunk/libavformat/oggparsevorbis.c
   trunk/libavformat/raw.c
   trunk/libavformat/riff.c
   trunk/libavformat/riff.h
   trunk/libavformat/rmdec.c
   trunk/libavformat/rpl.c
   trunk/libavformat/rtp.c
   trunk/libavformat/rtp.h
   trunk/libavformat/rtp_h264.c
   trunk/libavformat/rtp_internal.h
   trunk/libavformat/rtp_mpv.c
   trunk/libavformat/rtpdec.c
   trunk/libavformat/rtpenc.c
   trunk/libavformat/rtpproto.c
   trunk/libavformat/rtsp.c
   trunk/libavformat/sdp.c
   trunk/libavformat/smacker.c
   trunk/libavformat/sol.c
   trunk/libavformat/swf.c
   trunk/libavformat/tta.c
   trunk/libavformat/utils.c
   trunk/libavformat/wv.c
   trunk/libpostproc/postprocess.c
   trunk/libpostproc/postprocess_altivec_template.c
   trunk/libpostproc/postprocess_internal.h
   trunk/libpostproc/postprocess_template.c
   trunk/output_example.c
   trunk/tests/seek_test.c
   trunk/vhook/drawtext.c
   trunk/vhook/fish.c
   trunk/vhook/imlib2.c
   trunk/vhook/null.c
   trunk/vhook/ppm.c
   trunk/vhook/watermark.c

Modified: trunk/cmdutils.c
==============================================================================

--- trunk/cmdutils.c	(original)
+++ trunk/cmdutils.c	Fri May  9 13:56:36 2008
@@ -25,14 +25,14 @@
 #include <math.h>
 
 #include "config.h"
-#include "avformat.h"
-#include "avfilter.h"
-#include "avdevice.h"
+#include "libavformat/avformat.h"
+#include "libavfilter/avfilter.h"
+#include "libavdevice/avdevice.h"
+#include "libavutil/avstring.h"
 #include "cmdutils.h"
-#include "avstring.h"
 #include "version.h"
 #ifdef CONFIG_NETWORK
-#include "network.h"
+#include "libavformat/network.h"
 #endif
 
 #undef exit

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Fri May  9 13:56:36 2008
@@ -27,14 +27,14 @@
 #include <errno.h>
 #include <signal.h>
 #include <limits.h>
-#include "avformat.h"
-#include "avdevice.h"
-#include "swscale.h"
-#include "framehook.h"
-#include "opt.h"
-#include "fifo.h"
-#include "avstring.h"
-#include "os_support.h"
+#include "libavformat/avformat.h"
+#include "libavdevice/avdevice.h"
+#include "libswscale/swscale.h"
+#include "libavformat/framehook.h"
+#include "libavcodec/opt.h"
+#include "libavutil/fifo.h"
+#include "libavutil/avstring.h"
+#include "libavformat/os_support.h"
 
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	(original)
+++ trunk/ffplay.c	Fri May  9 13:56:36 2008
@@ -21,11 +21,11 @@
 
 #include <math.h>
 #include <limits.h>
-#include "avformat.h"
-#include "avdevice.h"
-#include "rtsp.h"
-#include "swscale.h"
-#include "avstring.h"
+#include "libavutil/avstring.h"
+#include "libavformat/avformat.h"
+#include "libavformat/rtsp.h"
+#include "libavdevice/avdevice.h"
+#include "libswscale/swscale.h"
 
 #include "version.h"
 #include "cmdutils.h"

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Fri May  9 13:56:36 2008
@@ -25,10 +25,13 @@
 #endif
 #include <string.h>
 #include <stdlib.h>
-#include "avformat.h"
-#include "rtsp.h"
-#include "rtp.h"
-#include "os_support.h"
+#include "libavutil/random.h"
+#include "libavutil/avstring.h"
+#include "libavformat/avformat.h"
+#include "libavformat/network.h"
+#include "libavformat/os_support.h"
+#include "libavformat/rtp.h"
+#include "libavformat/rtsp.h"
 
 #include <stdarg.h>
 #include <unistd.h>
@@ -47,11 +50,8 @@
 #include <dlfcn.h>
 #endif
 
-#include "network.h"
 #include "version.h"
 #include "ffserver.h"
-#include "random.h"
-#include "avstring.h"
 #include "cmdutils.h"
 
 #undef exit

Modified: trunk/libavcodec/ac3dec.c
==============================================================================
--- trunk/libavcodec/ac3dec.c	(original)
+++ trunk/libavcodec/ac3dec.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/ac3enc.c
==============================================================================
--- trunk/libavcodec/ac3enc.c	(original)
+++ trunk/libavcodec/ac3enc.c	Fri May  9 13:56:36 2008
@@ -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 {

Modified: trunk/libavcodec/ac3tab.h
==============================================================================
--- trunk/libavcodec/ac3tab.h	(original)
+++ trunk/libavcodec/ac3tab.h	Fri May  9 13:56:36 2008
@@ -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];

Modified: trunk/libavcodec/alpha/dsputil_alpha.c
==============================================================================
--- trunk/libavcodec/alpha/dsputil_alpha.c	(original)
+++ trunk/libavcodec/alpha/dsputil_alpha.c	Fri May  9 13:56:36 2008
@@ -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);

Modified: trunk/libavcodec/alpha/motion_est_alpha.c
==============================================================================
--- trunk/libavcodec/alpha/motion_est_alpha.c	(original)
+++ trunk/libavcodec/alpha/motion_est_alpha.c	Fri May  9 13:56:36 2008
@@ -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)

Modified: trunk/libavcodec/alpha/mpegvideo_alpha.c
==============================================================================
--- trunk/libavcodec/alpha/mpegvideo_alpha.c	(original)
+++ trunk/libavcodec/alpha/mpegvideo_alpha.c	Fri May  9 13:56:36 2008
@@ -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)

Modified: trunk/libavcodec/alpha/simple_idct_alpha.c
==============================================================================
--- trunk/libavcodec/alpha/simple_idct_alpha.c	(original)
+++ trunk/libavcodec/alpha/simple_idct_alpha.c	Fri May  9 13:56:36 2008
@@ -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);

Modified: trunk/libavcodec/armv4l/dsputil_arm.c
==============================================================================
--- trunk/libavcodec/armv4l/dsputil_arm.c	(original)
+++ trunk/libavcodec/armv4l/dsputil_arm.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/armv4l/dsputil_iwmmxt.c
==============================================================================
--- trunk/libavcodec/armv4l/dsputil_iwmmxt.c	(original)
+++ trunk/libavcodec/armv4l/dsputil_iwmmxt.c	Fri May  9 13:56:36 2008
@@ -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");

Modified: trunk/libavcodec/armv4l/mpegvideo_arm.c
==============================================================================
--- trunk/libavcodec/armv4l/mpegvideo_arm.c	(original)
+++ trunk/libavcodec/armv4l/mpegvideo_arm.c	Fri May  9 13:56:36 2008
@@ -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);

Modified: trunk/libavcodec/armv4l/mpegvideo_armv5te.c
==============================================================================
--- trunk/libavcodec/armv4l/mpegvideo_armv5te.c	(original)
+++ trunk/libavcodec/armv4l/mpegvideo_armv5te.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/armv4l/mpegvideo_iwmmxt.c
==============================================================================
--- trunk/libavcodec/armv4l/mpegvideo_iwmmxt.c	(original)
+++ trunk/libavcodec/armv4l/mpegvideo_iwmmxt.c	Fri May  9 13:56:36 2008
@@ -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)

Modified: trunk/libavcodec/bethsoftvideo.c
==============================================================================
--- trunk/libavcodec/bethsoftvideo.c	(original)
+++ trunk/libavcodec/bethsoftvideo.c	Fri May  9 13:56:36 2008
@@ -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"

Modified: trunk/libavcodec/bfi.c
==============================================================================
--- trunk/libavcodec/bfi.c	(original)
+++ trunk/libavcodec/bfi.c	Fri May  9 13:56:36 2008
@@ -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 {

Modified: trunk/libavcodec/bfin/dsputil_bfin.c
==============================================================================
--- trunk/libavcodec/bfin/dsputil_bfin.c	(original)
+++ trunk/libavcodec/bfin/dsputil_bfin.c	Fri May  9 13:56:36 2008
@@ -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;

Modified: trunk/libavcodec/bfin/mpegvideo_bfin.c
==============================================================================
--- trunk/libavcodec/bfin/mpegvideo_bfin.c	(original)
+++ trunk/libavcodec/bfin/mpegvideo_bfin.c	Fri May  9 13:56:36 2008
@@ -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"
 
 

Modified: trunk/libavcodec/bfin/vp3_bfin.c
==============================================================================
--- trunk/libavcodec/bfin/vp3_bfin.c	(original)
+++ trunk/libavcodec/bfin/vp3_bfin.c	Fri May  9 13:56:36 2008
@@ -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;

Modified: trunk/libavcodec/bitstream.h
==============================================================================
--- trunk/libavcodec/bitstream.h	(original)
+++ trunk/libavcodec/bitstream.h	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/bytestream.h
==============================================================================
--- trunk/libavcodec/bytestream.h	(original)
+++ trunk/libavcodec/bytestream.h	Fri May  9 13:56:36 2008
@@ -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){\

Modified: trunk/libavcodec/cabac.c
==============================================================================
--- trunk/libavcodec/cabac.c	(original)
+++ trunk/libavcodec/cabac.c	Fri May  9 13:56:36 2008
@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "bitstream.h"
 #include "cabac.h"
 

Modified: trunk/libavcodec/cabac.h
==============================================================================
--- trunk/libavcodec/cabac.h	(original)
+++ trunk/libavcodec/cabac.h	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/cook.c
==============================================================================
--- trunk/libavcodec/cook.c	(original)
+++ trunk/libavcodec/cook.c	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/cscd.c
==============================================================================
--- trunk/libavcodec/cscd.c	(original)
+++ trunk/libavcodec/cscd.c	Fri May  9 13:56:36 2008
@@ -26,7 +26,7 @@
 #ifdef CONFIG_ZLIB
 #include <zlib.h>
 #endif
-#include "lzo.h"
+#include "libavutil/lzo.h"
 
 typedef struct {
     AVFrame pic;

Modified: trunk/libavcodec/dvdata.h
==============================================================================
--- trunk/libavcodec/dvdata.h	(original)
+++ trunk/libavcodec/dvdata.h	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/elbg.c
==============================================================================
--- trunk/libavcodec/elbg.c	(original)
+++ trunk/libavcodec/elbg.c	Fri May  9 13:56:36 2008
@@ -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)
 

Modified: trunk/libavcodec/elbg.h
==============================================================================
--- trunk/libavcodec/elbg.h	(original)
+++ trunk/libavcodec/elbg.h	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/flac.c
==============================================================================
--- trunk/libavcodec/flac.c	(original)
+++ trunk/libavcodec/flac.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/flacenc.c
==============================================================================
--- trunk/libavcodec/flacenc.c	(original)
+++ trunk/libavcodec/flacenc.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/flicvideo.c
==============================================================================
--- trunk/libavcodec/flicvideo.c	(original)
+++ trunk/libavcodec/flicvideo.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/golomb.c
==============================================================================
--- trunk/libavcodec/golomb.c	(original)
+++ trunk/libavcodec/golomb.c	Fri May  9 13:56:36 2008
@@ -26,7 +26,7 @@
  * @author Michael Niedermayer <michaelni at 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,

Modified: trunk/libavcodec/h264data.h
==============================================================================
--- trunk/libavcodec/h264data.h	(original)
+++ trunk/libavcodec/h264data.h	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/h264enc.c
==============================================================================
--- trunk/libavcodec/h264enc.c	(original)
+++ trunk/libavcodec/h264enc.c	Fri May  9 13:56:36 2008
@@ -17,7 +17,7 @@
  */
 
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "bitstream.h"
 #include "mpegvideo.h"
 #include "h264data.h"

Modified: trunk/libavcodec/h264pred.h
==============================================================================
--- trunk/libavcodec/h264pred.h	(original)
+++ trunk/libavcodec/h264pred.h	Fri May  9 13:56:36 2008
@@ -28,7 +28,7 @@
 #ifndef FFMPEG_H264PRED_H
 #define FFMPEG_H264PRED_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 /**
  * Prediction types

Modified: trunk/libavcodec/i386/cavsdsp_mmx.c
==============================================================================
--- trunk/libavcodec/i386/cavsdsp_mmx.c	(original)
+++ trunk/libavcodec/i386/cavsdsp_mmx.c	Fri May  9 13:56:36 2008
@@ -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"
 
 /*****************************************************************************
  *

Modified: trunk/libavcodec/i386/cpuid.c
==============================================================================
--- trunk/libavcodec/i386/cpuid.c	(original)
+++ trunk/libavcodec/i386/cpuid.c	Fri May  9 13:56:36 2008
@@ -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
 

Modified: trunk/libavcodec/i386/dsputil_mmx.c
==============================================================================
--- trunk/libavcodec/i386/dsputil_mmx.c	(original)
+++ trunk/libavcodec/i386/dsputil_mmx.c	Fri May  9 13:56:36 2008
@@ -22,16 +22,16 @@
  * MMX optimization by Nick Kurshev <nickols_k at 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>

Modified: trunk/libavcodec/i386/dsputil_mmx.h
==============================================================================
--- trunk/libavcodec/i386/dsputil_mmx.h	(original)
+++ trunk/libavcodec/i386/dsputil_mmx.h	Fri May  9 13:56:36 2008
@@ -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;
 

Modified: trunk/libavcodec/i386/dsputilenc_mmx.c
==============================================================================
--- trunk/libavcodec/i386/dsputilenc_mmx.c	(original)
+++ trunk/libavcodec/i386/dsputilenc_mmx.c	Fri May  9 13:56:36 2008
@@ -22,10 +22,10 @@
  * MMX optimization by Nick Kurshev <nickols_k at 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)

Modified: trunk/libavcodec/i386/fdct_mmx.c
==============================================================================
--- trunk/libavcodec/i386/fdct_mmx.c	(original)
+++ trunk/libavcodec/i386/fdct_mmx.c	Fri May  9 13:56:36 2008
@@ -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)))

Modified: trunk/libavcodec/i386/fft_3dn.c
==============================================================================
--- trunk/libavcodec/i386/fft_3dn.c	(original)
+++ trunk/libavcodec/i386/fft_3dn.c	Fri May  9 13:56:36 2008
@@ -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 };

Modified: trunk/libavcodec/i386/fft_3dn2.c
==============================================================================
--- trunk/libavcodec/i386/fft_3dn2.c	(original)
+++ trunk/libavcodec/i386/fft_3dn2.c	Fri May  9 13:56:36 2008
@@ -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 };

Modified: trunk/libavcodec/i386/fft_sse.c
==============================================================================
--- trunk/libavcodec/i386/fft_sse.c	(original)
+++ trunk/libavcodec/i386/fft_sse.c	Fri May  9 13:56:36 2008
@@ -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 };

Modified: trunk/libavcodec/i386/flacdsp_mmx.c
==============================================================================
--- trunk/libavcodec/i386/flacdsp_mmx.c	(original)
+++ trunk/libavcodec/i386/flacdsp_mmx.c	Fri May  9 13:56:36 2008
@@ -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)
 {

Modified: trunk/libavcodec/i386/h264_i386.h
==============================================================================
--- trunk/libavcodec/i386/h264_i386.h	(original)
+++ trunk/libavcodec/i386/h264_i386.h	Fri May  9 13:56:36 2008
@@ -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)

Modified: trunk/libavcodec/i386/idct_mmx.c
==============================================================================
--- trunk/libavcodec/i386/idct_mmx.c	(original)
+++ trunk/libavcodec/i386/idct_mmx.c	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/i386/idct_mmx_xvid.c
==============================================================================
--- trunk/libavcodec/i386/idct_mmx_xvid.c	(original)
+++ trunk/libavcodec/i386/idct_mmx_xvid.c	Fri May  9 13:56:36 2008
@@ -40,7 +40,7 @@
  */
 
 #include <inttypes.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 
 //=============================================================================
 // Macros and other preprocessor constants

Modified: trunk/libavcodec/i386/idct_sse2_xvid.c
==============================================================================
--- trunk/libavcodec/i386/idct_sse2_xvid.c	(original)
+++ trunk/libavcodec/i386/idct_sse2_xvid.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/i386/motion_est_mmx.c
==============================================================================
--- trunk/libavcodec/i386/motion_est_mmx.c	(original)
+++ trunk/libavcodec/i386/motion_est_mmx.c	Fri May  9 13:56:36 2008
@@ -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,

Modified: trunk/libavcodec/i386/mpegvideo_mmx.c
==============================================================================
--- trunk/libavcodec/i386/mpegvideo_mmx.c	(original)
+++ trunk/libavcodec/i386/mpegvideo_mmx.c	Fri May  9 13:56:36 2008
@@ -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];
 

Modified: trunk/libavcodec/i386/simple_idct_mmx.c
==============================================================================
--- trunk/libavcodec/i386/simple_idct_mmx.c	(original)
+++ trunk/libavcodec/i386/simple_idct_mmx.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/i386/snowdsp_mmx.c
==============================================================================
--- trunk/libavcodec/i386/snowdsp_mmx.c	(original)
+++ trunk/libavcodec/i386/snowdsp_mmx.c	Fri May  9 13:56:36 2008
@@ -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;

Modified: trunk/libavcodec/i386/vc1dsp_mmx.c
==============================================================================
--- trunk/libavcodec/i386/vc1dsp_mmx.c	(original)
+++ trunk/libavcodec/i386/vc1dsp_mmx.c	Fri May  9 13:56:36 2008
@@ -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)                                    \

Modified: trunk/libavcodec/i386/vp3dsp_mmx.c
==============================================================================
--- trunk/libavcodec/i386/vp3dsp_mmx.c	(original)
+++ trunk/libavcodec/i386/vp3dsp_mmx.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/i386/vp3dsp_sse2.c
==============================================================================
--- trunk/libavcodec/i386/vp3dsp_sse2.c	(original)
+++ trunk/libavcodec/i386/vp3dsp_sse2.c	Fri May  9 13:56:36 2008
@@ -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[]) =

Modified: trunk/libavcodec/i386/vp3dsp_sse2.h
==============================================================================
--- trunk/libavcodec/i386/vp3dsp_sse2.h	(original)
+++ trunk/libavcodec/i386/vp3dsp_sse2.h	Fri May  9 13:56:36 2008
@@ -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);

Modified: trunk/libavcodec/jfdctfst.c
==============================================================================
--- trunk/libavcodec/jfdctfst.c	(original)
+++ trunk/libavcodec/jfdctfst.c	Fri May  9 13:56:36 2008
@@ -70,7 +70,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 
 #define DCTSIZE 8

Modified: trunk/libavcodec/jfdctint.c
==============================================================================
--- trunk/libavcodec/jfdctint.c	(original)
+++ trunk/libavcodec/jfdctint.c	Fri May  9 13:56:36 2008
@@ -63,7 +63,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 
 #define SHIFT_TEMPS

Modified: trunk/libavcodec/jrevdct.c
==============================================================================
--- trunk/libavcodec/jrevdct.c	(original)
+++ trunk/libavcodec/jrevdct.c	Fri May  9 13:56:36 2008
@@ -64,7 +64,7 @@
  * Independent JPEG Group's LLM idct.
  */
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 
 #define EIGHT_BIT_SAMPLES

Modified: trunk/libavcodec/libtheoraenc.c
==============================================================================
--- trunk/libavcodec/libtheoraenc.c	(original)
+++ trunk/libavcodec/libtheoraenc.c	Fri May  9 13:56:36 2008
@@ -31,8 +31,8 @@
  */
 
 /* FFmpeg includes */
+#include "libavutil/log.h"
 #include "avcodec.h"
-#include "log.h"
 
 /* libtheora includes */
 #include <theora/theora.h>

Modified: trunk/libavcodec/mathops.h
==============================================================================
--- trunk/libavcodec/mathops.h	(original)
+++ trunk/libavcodec/mathops.h	Fri May  9 13:56:36 2008
@@ -22,7 +22,7 @@
 #ifndef FFMPEG_MATHOPS_H
 #define FFMPEG_MATHOPS_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 #ifdef ARCH_X86_32
 

Modified: trunk/libavcodec/mlib/dsputil_mlib.c
==============================================================================
--- trunk/libavcodec/mlib/dsputil_mlib.c	(original)
+++ trunk/libavcodec/mlib/dsputil_mlib.c	Fri May  9 13:56:36 2008
@@ -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>

Modified: trunk/libavcodec/mlp_parser.c
==============================================================================
--- trunk/libavcodec/mlp_parser.c	(original)
+++ trunk/libavcodec/mlp_parser.c	Fri May  9 13:56:36 2008
@@ -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] = {

Modified: trunk/libavcodec/mpc.c
==============================================================================
--- trunk/libavcodec/mpc.c	(original)
+++ trunk/libavcodec/mpc.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/mpc.h
==============================================================================
--- trunk/libavcodec/mpc.h	(original)
+++ trunk/libavcodec/mpc.h	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/mpc7.c
==============================================================================
--- trunk/libavcodec/mpc7.c	(original)
+++ trunk/libavcodec/mpc7.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/mpc8.c
==============================================================================
--- trunk/libavcodec/mpc8.c	(original)
+++ trunk/libavcodec/mpc8.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/mpeg12data.h
==============================================================================
--- trunk/libavcodec/mpeg12data.h	(original)
+++ trunk/libavcodec/mpeg12data.h	Fri May  9 13:56:36 2008
@@ -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];

Modified: trunk/libavcodec/mpegaudiodata.h
==============================================================================
--- trunk/libavcodec/mpegaudiodata.h	(original)
+++ trunk/libavcodec/mpegaudiodata.h	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/mpegaudiodecheader.h
==============================================================================
--- trunk/libavcodec/mpegaudiodecheader.h	(original)
+++ trunk/libavcodec/mpegaudiodecheader.h	Fri May  9 13:56:36 2008
@@ -27,7 +27,7 @@
 #ifndef FFMPEG_MPEGAUDIODECHEADER_H
 #define FFMPEG_MPEGAUDIODECHEADER_H
 
-#include "common.h"
+#include "libavutil/common.h"
 #include "mpegaudio.h"
 
 

Modified: trunk/libavcodec/msmpeg4data.h
==============================================================================
--- trunk/libavcodec/msmpeg4data.h	(original)
+++ trunk/libavcodec/msmpeg4data.h	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/nellymoserdec.c
==============================================================================
--- trunk/libavcodec/nellymoserdec.c	(original)
+++ trunk/libavcodec/nellymoserdec.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/nuv.c
==============================================================================
--- trunk/libavcodec/nuv.c	(original)
+++ trunk/libavcodec/nuv.c	Fri May  9 13:56:36 2008
@@ -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 {

Modified: trunk/libavcodec/ppc/dsputil_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/dsputil_altivec.c	(original)
+++ trunk/libavcodec/ppc/dsputil_altivec.c	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/ppc/dsputil_ppc.c
==============================================================================
--- trunk/libavcodec/ppc/dsputil_ppc.c	(original)
+++ trunk/libavcodec/ppc/dsputil_ppc.c	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/ppc/fdct_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/fdct_altivec.c	(original)
+++ trunk/libavcodec/ppc/fdct_altivec.c	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/ppc/fft_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/fft_altivec.c	(original)
+++ trunk/libavcodec/ppc/fft_altivec.c	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/ppc/float_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/float_altivec.c	(original)
+++ trunk/libavcodec/ppc/float_altivec.c	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/ppc/gmc_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/gmc_altivec.c	(original)
+++ trunk/libavcodec/ppc/gmc_altivec.c	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/ppc/h264_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/h264_altivec.c	(original)
+++ trunk/libavcodec/ppc/h264_altivec.c	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/ppc/idct_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/idct_altivec.c	(original)
+++ trunk/libavcodec/ppc/idct_altivec.c	Fri May  9 13:56:36 2008
@@ -38,7 +38,7 @@
 
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "gcc_fixes.h"
 

Modified: trunk/libavcodec/ppc/int_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/int_altivec.c	(original)
+++ trunk/libavcodec/ppc/int_altivec.c	Fri May  9 13:56:36 2008
@@ -23,7 +23,7 @@
  ** integer misc ops.
  **/
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "gcc_fixes.h"
 

Modified: trunk/libavcodec/ppc/mpegvideo_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/mpegvideo_altivec.c	(original)
+++ trunk/libavcodec/ppc/mpegvideo_altivec.c	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/ppc/snow_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/snow_altivec.c	(original)
+++ trunk/libavcodec/ppc/snow_altivec.c	Fri May  9 13:56:36 2008
@@ -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>

Modified: trunk/libavcodec/ppc/vc1dsp_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/vc1dsp_altivec.c	(original)
+++ trunk/libavcodec/ppc/vc1dsp_altivec.c	Fri May  9 13:56:36 2008
@@ -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"
 

Modified: trunk/libavcodec/ps2/dsputil_mmi.c
==============================================================================
--- trunk/libavcodec/ps2/dsputil_mmi.c	(original)
+++ trunk/libavcodec/ps2/dsputil_mmi.c	Fri May  9 13:56:36 2008
@@ -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);

Modified: trunk/libavcodec/ps2/idct_mmi.c
==============================================================================
--- trunk/libavcodec/ps2/idct_mmi.c	(original)
+++ trunk/libavcodec/ps2/idct_mmi.c	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavcodec/ps2/mpegvideo_mmi.c
==============================================================================
--- trunk/libavcodec/ps2/mpegvideo_mmi.c	(original)
+++ trunk/libavcodec/ps2/mpegvideo_mmi.c	Fri May  9 13:56:36 2008
@@ -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)

Modified: trunk/libavcodec/rangecoder.h
==============================================================================
--- trunk/libavcodec/rangecoder.h	(original)
+++ trunk/libavcodec/rangecoder.h	Fri May  9 13:56:36 2008
@@ -29,7 +29,7 @@
 
 #include <stdint.h>
 #include <assert.h>
-#include "common.h"
+#include "libavutil/common.h"
 
 typedef struct RangeCoder{
     int low;

Modified: trunk/libavcodec/rectangle.h
==============================================================================
--- trunk/libavcodec/rectangle.h	(original)
+++ trunk/libavcodec/rectangle.h	Fri May  9 13:56:36 2008
@@ -28,7 +28,7 @@
 #ifndef FFMPEG_RECTANGLE_H
 #define FFMPEG_RECTANGLE_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 /**
  * fill a rectangle.

Modified: trunk/libavcodec/roqvideo.h
==============================================================================
--- trunk/libavcodec/roqvideo.h	(original)
+++ trunk/libavcodec/roqvideo.h	Fri May  9 13:56:36 2008
@@ -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];

Modified: trunk/libavcodec/rtjpeg.c
==============================================================================
--- trunk/libavcodec/rtjpeg.c	(original)
+++ trunk/libavcodec/rtjpeg.c	Fri May  9 13:56:36 2008
@@ -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"

Modified: trunk/libavcodec/sh4/dsputil_align.c
==============================================================================
--- trunk/libavcodec/sh4/dsputil_align.c	(original)
+++ trunk/libavcodec/sh4/dsputil_align.c	Fri May  9 13:56:36 2008
@@ -21,8 +21,8 @@
  */
 
 
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/dsputil.h"
 
 
 #define         LP(p)           *(uint32_t*)(p)

Modified: trunk/libavcodec/sh4/dsputil_sh4.c
==============================================================================
--- trunk/libavcodec/sh4/dsputil_sh4.c	(original)
+++ trunk/libavcodec/sh4/dsputil_sh4.c	Fri May  9 13:56:36 2008
@@ -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)
 {

Modified: trunk/libavcodec/sh4/idct_sh4.c
==============================================================================
--- trunk/libavcodec/sh4/idct_sh4.c	(original)
+++ trunk/libavcodec/sh4/idct_sh4.c	Fri May  9 13:56:36 2008
@@ -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) */

Modified: trunk/libavcodec/sparc/dsputil_vis.c
==============================================================================
--- trunk/libavcodec/sparc/dsputil_vis.c	(original)
+++ trunk/libavcodec/sparc/dsputil_vis.c	Fri May  9 13:56:36 2008
@@ -27,7 +27,7 @@
 
 #include <inttypes.h>
 
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 
 #include "vis.h"
 

Modified: trunk/libavcodec/sparc/simple_idct_vis.c
==============================================================================
--- trunk/libavcodec/sparc/simple_idct_vis.c	(original)
+++ trunk/libavcodec/sparc/simple_idct_vis.c	Fri May  9 13:56:36 2008
@@ -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,

Modified: trunk/libavcodec/utils.c
==============================================================================
--- trunk/libavcodec/utils.c	(original)
+++ trunk/libavcodec/utils.c	Fri May  9 13:56:36 2008
@@ -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>

Modified: trunk/libavcodec/vc1data.h
==============================================================================
--- trunk/libavcodec/vc1data.h	(original)
+++ trunk/libavcodec/vc1data.h	Fri May  9 13:56:36 2008
@@ -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];

Modified: trunk/libavcodec/vp56data.h
==============================================================================
--- trunk/libavcodec/vp56data.h	(original)
+++ trunk/libavcodec/vp56data.h	Fri May  9 13:56:36 2008
@@ -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,

Modified: trunk/libavcodec/xiph.h
==============================================================================
--- trunk/libavcodec/xiph.h	(original)
+++ trunk/libavcodec/xiph.h	Fri May  9 13:56:36 2008
@@ -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

Modified: trunk/libavdevice/alldevices.c
==============================================================================
--- trunk/libavdevice/alldevices.c	(original)
+++ trunk/libavdevice/alldevices.c	Fri May  9 13:56:36 2008
@@ -17,8 +17,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 "avformat.h"
+
 #include "config.h"
+#include "libavformat/avformat.h"
 
 #define REGISTER_MUXER(X,x) { \
           extern AVOutputFormat x##_muxer; \

Modified: trunk/libavdevice/audio.c
==============================================================================
--- trunk/libavdevice/audio.c	(original)
+++ trunk/libavdevice/audio.c	Fri May  9 13:56:36 2008
@@ -35,9 +35,9 @@
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
-#include "log.h"
-#include "avcodec.h"
-#include "avformat.h"
+#include "libavutil/log.h"
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
 
 #define AUDIO_BLOCK_SIZE 4096
 

Modified: trunk/libavdevice/beosaudio.cpp
==============================================================================
--- trunk/libavdevice/beosaudio.cpp	(original)
+++ trunk/libavdevice/beosaudio.cpp	Fri May  9 13:56:36 2008
@@ -30,7 +30,7 @@
 #include <SoundPlayer.h>
 
 extern "C" {
-#include "avformat.h"
+#include "libavformat/avformat.h"
 }
 
 #ifdef HAVE_BSOUNDRECORDER

Modified: trunk/libavdevice/bktr.c
==============================================================================
--- trunk/libavdevice/bktr.c	(original)
+++ trunk/libavdevice/bktr.c	Fri May  9 13:56:36 2008
@@ -23,7 +23,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 "avformat.h"
+
+#include "libavformat/avformat.h"
 #if defined (HAVE_DEV_BKTR_IOCTL_METEOR_H) && defined (HAVE_DEV_BKTR_IOCTL_BT848_H)
 # include <dev/bktr/ioctl_meteor.h>
 # include <dev/bktr/ioctl_bt848.h>

Modified: trunk/libavdevice/dv1394.c
==============================================================================
--- trunk/libavdevice/dv1394.c	(original)
+++ trunk/libavdevice/dv1394.c	Fri May  9 13:56:36 2008
@@ -29,12 +29,12 @@
 #include <sys/time.h>
 #include <time.h>
 
-#include "avformat.h"
+#include "libavformat/avformat.h"
 
 #undef DV1394_DEBUG
 
+#include "libavformat/dv.h"
 #include "dv1394.h"
-#include "dv.h"
 
 struct dv1394_data {
     int fd;

Modified: trunk/libavdevice/libdc1394.c
==============================================================================
--- trunk/libavdevice/libdc1394.c	(original)
+++ trunk/libavdevice/libdc1394.c	Fri May  9 13:56:36 2008
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
 
 #if ENABLE_LIBDC1394_2
 #include <dc1394/dc1394.h>

Modified: trunk/libavdevice/v4l.c
==============================================================================
--- trunk/libavdevice/v4l.c	(original)
+++ trunk/libavdevice/v4l.c	Fri May  9 13:56:36 2008
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-#include "avformat.h"
-#include "dsputil.h"
+#include "libavformat/avformat.h"
+#include "libavcodec/dsputil.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>

Modified: trunk/libavdevice/v4l2.c
==============================================================================
--- trunk/libavdevice/v4l2.c	(original)
+++ trunk/libavdevice/v4l2.c	Fri May  9 13:56:36 2008
@@ -28,7 +28,7 @@
  */
 
 #include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>

Modified: trunk/libavdevice/vfwcap.c
==============================================================================
--- trunk/libavdevice/vfwcap.c	(original)
+++ trunk/libavdevice/vfwcap.c	Fri May  9 13:56:36 2008
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avformat.h"
+#include "libavformat/avformat.h"
 #include <vfw.h>
 #include <windows.h>
 

Modified: trunk/libavdevice/x11grab.c
==============================================================================
--- trunk/libavdevice/x11grab.c	(original)
+++ trunk/libavdevice/x11grab.c	Fri May  9 13:56:36 2008
@@ -36,7 +36,7 @@
  */
 
 #include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>

Modified: trunk/libavfilter/avfilter.c
==============================================================================
--- trunk/libavfilter/avfilter.c	(original)
+++ trunk/libavfilter/avfilter.c	Fri May  9 13:56:36 2008
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/imgconvert.h"
 #include "avfilter.h"
-#include "imgconvert.h"
 
 /** list of registered filters */
 struct FilterList

Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h	(original)
+++ trunk/libavfilter/avfilter.h	Fri May  9 13:56:36 2008
@@ -35,7 +35,7 @@
 #define LIBAVFILTER_BUILD       LIBAVFILTER_VERSION_INT
 
 #include <stddef.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 
 typedef struct AVFilterContext AVFilterContext;
 typedef struct AVFilterLink    AVFilterLink;

Modified: trunk/libavfilter/defaults.c
==============================================================================
--- trunk/libavfilter/defaults.c	(original)
+++ trunk/libavfilter/defaults.c	Fri May  9 13:56:36 2008
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/imgconvert.h"
 #include "avfilter.h"
-#include "imgconvert.h"
 
 /* TODO: buffer pool.  see comment for avfilter_default_get_video_buffer() */
 void avfilter_default_free_video_buffer(AVFilterPic *pic)

Modified: trunk/libavformat/adtsenc.c
==============================================================================
--- trunk/libavformat/adtsenc.c	(original)
+++ trunk/libavformat/adtsenc.c	Fri May  9 13:56:36 2008
@@ -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 "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 #define ADTS_HEADER_SIZE 7
 

Modified: trunk/libavformat/aiff.c
==============================================================================
--- trunk/libavformat/aiff.c	(original)
+++ trunk/libavformat/aiff.c	Fri May  9 13:56:36 2008
@@ -18,10 +18,11 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intfloat_readwrite.h"
 #include "avformat.h"
 #include "raw.h"
 #include "riff.h"
-#include "intfloat_readwrite.h"
 
 static const AVCodecTag codec_aiff_tags[] = {
     { CODEC_ID_PCM_S16BE, MKTAG('N','O','N','E') },

Modified: trunk/libavformat/asf.c
==============================================================================
--- trunk/libavformat/asf.c	(original)
+++ trunk/libavformat/asf.c	Fri May  9 13:56:36 2008
@@ -18,11 +18,12 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/common.h"
+#include "libavcodec/mpegaudio.h"
 #include "avformat.h"
 #include "riff.h"
-#include "mpegaudio.h"
 #include "asf.h"
-#include "common.h"
 #include "asfcrypt.h"
 
 extern void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format);

Modified: trunk/libavformat/asfcrypt.c
==============================================================================
--- trunk/libavformat/asfcrypt.c	(original)
+++ trunk/libavformat/asfcrypt.c	Fri May  9 13:56:36 2008
@@ -19,11 +19,12 @@
  * 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 "intreadwrite.h"
-#include "bswap.h"
-#include "des.h"
-#include "rc4.h"
+
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/bswap.h"
+#include "libavutil/des.h"
+#include "libavutil/rc4.h"
 #include "asfcrypt.h"
 
 /**

Modified: trunk/libavformat/avio.c
==============================================================================
--- trunk/libavformat/avio.c	(original)
+++ trunk/libavformat/avio.c	Fri May  9 13:56:36 2008
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
+#include "libavcodec/opt.h"
 #include "avformat.h"
-#include "avstring.h"
-#include "opt.h"
 
 #if LIBAVFORMAT_VERSION_MAJOR >= 53
 /** @name Logging context. */

Modified: trunk/libavformat/aviobuf.c
==============================================================================
--- trunk/libavformat/aviobuf.c	(original)
+++ trunk/libavformat/aviobuf.c	Fri May  9 13:56:36 2008
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/crc.h"
 #include "avformat.h"
 #include "avio.h"
-#include "crc.h"
 #include <stdarg.h>
 
 #define IO_BUFFER_SIZE 32768

Modified: trunk/libavformat/bethsoftvid.c
==============================================================================
--- trunk/libavformat/bethsoftvid.c	(original)
+++ trunk/libavformat/bethsoftvid.c	Fri May  9 13:56:36 2008
@@ -28,7 +28,7 @@
  */
 
 #include "avformat.h"
-#include "bethsoftvideo.h"
+#include "libavcodec/bethsoftvideo.h"
 
 typedef struct BVID_DemuxContext
 {

Modified: trunk/libavformat/crcenc.c
==============================================================================
--- trunk/libavformat/crcenc.c	(original)
+++ trunk/libavformat/crcenc.c	Fri May  9 13:56:36 2008
@@ -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 "libavutil/adler32.h"
 #include "avformat.h"
-#include "adler32.h"
 
 typedef struct CRCState {
     uint32_t crcval;

Modified: trunk/libavformat/dv.c
==============================================================================
--- trunk/libavformat/dv.c	(original)
+++ trunk/libavformat/dv.c	Fri May  9 13:56:36 2008
@@ -29,7 +29,7 @@
  */
 #include <time.h>
 #include "avformat.h"
-#include "dvdata.h"
+#include "libavcodec/dvdata.h"
 #include "dv.h"
 
 struct DVDemuxContext {

Modified: trunk/libavformat/dvenc.c
==============================================================================
--- trunk/libavformat/dvenc.c	(original)
+++ trunk/libavformat/dvenc.c	Fri May  9 13:56:36 2008
@@ -30,9 +30,9 @@
 #include <time.h>
 #include <stdarg.h>
 #include "avformat.h"
-#include "dvdata.h"
+#include "libavcodec/dvdata.h"
 #include "dv.h"
-#include "fifo.h"
+#include "libavutil/fifo.h"
 
 struct DVMuxContext {
     const DVprofile*  sys;    /* Current DV profile. E.g.: 525/60, 625/50 */

Modified: trunk/libavformat/file.c
==============================================================================
--- trunk/libavformat/file.c	(original)
+++ trunk/libavformat/file.c	Fri May  9 13:56:36 2008
@@ -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 "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>

Modified: trunk/libavformat/framecrcenc.c
==============================================================================
--- trunk/libavformat/framecrcenc.c	(original)
+++ trunk/libavformat/framecrcenc.c	Fri May  9 13:56:36 2008
@@ -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 "libavutil/adler32.h"
 #include "avformat.h"
-#include "adler32.h"
 
 static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 {

Modified: trunk/libavformat/framehook.h
==============================================================================
--- trunk/libavformat/framehook.h	(original)
+++ trunk/libavformat/framehook.h	Fri May  9 13:56:36 2008
@@ -28,7 +28,7 @@
  * Prototypes for interface to .so that implement a video processing hook
  */
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 
 /* Function must be called 'Configure' */
 typedef int (FrameHookConfigure)(void **ctxp, int argc, char *argv[]);

Modified: trunk/libavformat/gif.c
==============================================================================
--- trunk/libavformat/gif.c	(original)
+++ trunk/libavformat/gif.c	Fri May  9 13:56:36 2008
@@ -40,7 +40,7 @@
  */
 
 #include "avformat.h"
-#include "bitstream.h"
+#include "libavcodec/bitstream.h"
 
 /* bitstream minipacket size */
 #define GIF_CHUNKS 100

Modified: trunk/libavformat/gxf.c
==============================================================================
--- trunk/libavformat/gxf.c	(original)
+++ trunk/libavformat/gxf.c	Fri May  9 13:56:36 2008
@@ -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 "libavutil/common.h"
 #include "avformat.h"
-#include "common.h"
 #include "gxf.h"
 
 typedef struct {

Modified: trunk/libavformat/gxfenc.c
==============================================================================
--- trunk/libavformat/gxfenc.c	(original)
+++ trunk/libavformat/gxfenc.c	Fri May  9 13:56:36 2008
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/fifo.h"
 #include "avformat.h"
 #include "gxf.h"
 #include "riff.h"
-#include "fifo.h"
 
 #define GXF_AUDIO_PACKET_SIZE 65536
 

Modified: trunk/libavformat/http.c
==============================================================================
--- trunk/libavformat/http.c	(original)
+++ trunk/libavformat/http.c	Fri May  9 13:56:36 2008
@@ -18,14 +18,14 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/base64.h"
+#include "libavutil/avstring.h"
 #include "avformat.h"
 #include <unistd.h>
 #include "network.h"
 #include "os_support.h"
 
-#include "base64.h"
-#include "avstring.h"
-
 /* XXX: POST protocol is not completely implemented because ffmpeg uses
    only a subset of it. */
 

Modified: trunk/libavformat/img2.c
==============================================================================
--- trunk/libavformat/img2.c	(original)
+++ trunk/libavformat/img2.c	Fri May  9 13:56:36 2008
@@ -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 "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 
 typedef struct {
     int img_first;

Modified: trunk/libavformat/matroska.h
==============================================================================
--- trunk/libavformat/matroska.h	(original)
+++ trunk/libavformat/matroska.h	Fri May  9 13:56:36 2008
@@ -22,7 +22,7 @@
 #ifndef FFMPEG_MATROSKA_H
 #define FFMPEG_MATROSKA_H
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 
 /* EBML version supported */
 #define EBML_VERSION 1

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Fri May  9 13:56:36 2008
@@ -31,9 +31,9 @@
 #include "avformat.h"
 /* For codec_get_id(). */
 #include "riff.h"
-#include "intfloat_readwrite.h"
 #include "matroska.h"
 #include "libavcodec/mpeg4audio.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "libavutil/lzo.h"
 
 typedef struct Track {

Modified: trunk/libavformat/matroskaenc.c
==============================================================================
--- trunk/libavformat/matroskaenc.c	(original)
+++ trunk/libavformat/matroskaenc.c	Fri May  9 13:56:36 2008
@@ -20,11 +20,11 @@
  */
 
 #include "avformat.h"
-#include "md5.h"
 #include "riff.h"
-#include "xiph.h"
 #include "matroska.h"
 #include "avc.h"
+#include "libavutil/md5.h"
+#include "libavcodec/xiph.h"
 #include "libavcodec/mpeg4audio.h"
 
 typedef struct ebml_master {

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	(original)
+++ trunk/libavformat/mov.c	Fri May  9 13:56:36 2008
@@ -27,8 +27,8 @@
 #include "riff.h"
 #include "isom.h"
 #include "dv.h"
-#include "mpeg4audio.h"
-#include "mpegaudiodata.h"
+#include "libavcodec/mpeg4audio.h"
+#include "libavcodec/mpegaudiodata.h"
 
 #ifdef CONFIG_ZLIB
 #include <zlib.h>

Modified: trunk/libavformat/mp3.c
==============================================================================
--- trunk/libavformat/mp3.c	(original)
+++ trunk/libavformat/mp3.c	Fri May  9 13:56:36 2008
@@ -18,10 +18,11 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
+#include "libavcodec/mpegaudio.h"
+#include "libavcodec/mpegaudiodecheader.h"
 #include "avformat.h"
-#include "mpegaudio.h"
-#include "avstring.h"
-#include "mpegaudiodecheader.h"
 
 #define ID3v2_HEADER_SIZE 10
 #define ID3v1_TAG_SIZE 128

Modified: trunk/libavformat/mpc.c
==============================================================================
--- trunk/libavformat/mpc.c	(original)
+++ trunk/libavformat/mpc.c	Fri May  9 13:56:36 2008
@@ -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 "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 #define MPC_FRAMESIZE  1152
 #define DELAY_FRAMES   32

Modified: trunk/libavformat/mpc8.c
==============================================================================
--- trunk/libavformat/mpc8.c	(original)
+++ trunk/libavformat/mpc8.c	Fri May  9 13:56:36 2008
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
+#include "libavcodec/unary.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "unary.h"
 
 /// Two-byte MPC tag
 #define MKMPCTAG(a, b) (a | (b << 8))

Modified: trunk/libavformat/mpeg.h
==============================================================================
--- trunk/libavformat/mpeg.h	(original)
+++ trunk/libavformat/mpeg.h	Fri May  9 13:56:36 2008
@@ -23,7 +23,7 @@
 #define FFMPEG_MPEG_H
 
 #include <stdint.h>
-#include "intreadwrite.h"
+#include "libavutil/intreadwrite.h"
 
 #define PACK_START_CODE             ((unsigned int)0x000001ba)
 #define SYSTEM_HEADER_START_CODE    ((unsigned int)0x000001bb)

Modified: trunk/libavformat/mpegenc.c
==============================================================================
--- trunk/libavformat/mpegenc.c	(original)
+++ trunk/libavformat/mpegenc.c	Fri May  9 13:56:36 2008
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/fifo.h"
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "fifo.h"
 #include "mpeg.h"
 
 #define MAX_PAYLOAD_SIZE 4096

Modified: trunk/libavformat/mpegts.c
==============================================================================
--- trunk/libavformat/mpegts.c	(original)
+++ trunk/libavformat/mpegts.c	Fri May  9 13:56:36 2008
@@ -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 "libavutil/crc.h"
 #include "avformat.h"
-#include "crc.h"
 #include "mpegts.h"
 
 //#define DEBUG_SI

Modified: trunk/libavformat/mpegtsenc.c
==============================================================================
--- trunk/libavformat/mpegtsenc.c	(original)
+++ trunk/libavformat/mpegtsenc.c	Fri May  9 13:56:36 2008
@@ -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 "libavutil/crc.h"
 #include "avformat.h"
-#include "crc.h"
 #include "mpegts.h"
 
 /* write DVB SI sections */

Modified: trunk/libavformat/msnwc_tcp.c
==============================================================================
--- trunk/libavformat/msnwc_tcp.c	(original)
+++ trunk/libavformat/msnwc_tcp.c	Fri May  9 13:56:36 2008
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "bytestream.h"
 
 #define HEADER_SIZE         24
 

Modified: trunk/libavformat/mtv.c
==============================================================================
--- trunk/libavformat/mtv.c	(original)
+++ trunk/libavformat/mtv.c	Fri May  9 13:56:36 2008
@@ -24,8 +24,8 @@
  * MTV demuxer.
  */
 
+#include "libavutil/bswap.h"
 #include "avformat.h"
-#include "bswap.h"
 
 #define MTV_ASUBCHUNK_DATA_SIZE 500
 #define MTV_HEADER_SIZE 512

Modified: trunk/libavformat/mxf.c
==============================================================================
--- trunk/libavformat/mxf.c	(original)
+++ trunk/libavformat/mxf.c	Fri May  9 13:56:36 2008
@@ -45,9 +45,9 @@
 
 //#define DEBUG
 
+#include "libavutil/aes.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "aes.h"
-#include "bytestream.h"
 
 typedef uint8_t UID[16];
 

Modified: trunk/libavformat/nut.c
==============================================================================
--- trunk/libavformat/nut.c	(original)
+++ trunk/libavformat/nut.c	Fri May  9 13:56:36 2008
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/tree.h"
 #include "nut.h"
-#include "tree.h"
 
 const AVCodecTag ff_nut_subtitle_tags[] = {
     { CODEC_ID_TEXT        , MKTAG('U', 'T', 'F', '8') },

Modified: trunk/libavformat/nut.h
==============================================================================
--- trunk/libavformat/nut.h	(original)
+++ trunk/libavformat/nut.h	Fri May  9 13:56:36 2008
@@ -23,10 +23,10 @@
 #define FFMPEG_NUT_H
 
 //#include <limits.h>
+//#include "libavutil/adler32.h"
+//#include "libavcodec/mpegaudio.h"
 #include "avformat.h"
-//#include "mpegaudio.h"
 #include "riff.h"
-//#include "adler32.h"
 
 #define      MAIN_STARTCODE (0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48))
 #define    STREAM_STARTCODE (0x11405BF2F9DBULL + (((uint64_t)('N'<<8) + 'S')<<48))

Modified: trunk/libavformat/nutdec.c
==============================================================================
--- trunk/libavformat/nutdec.c	(original)
+++ trunk/libavformat/nutdec.c	Fri May  9 13:56:36 2008
@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "tree.h"
+#include "libavutil/avstring.h"
+#include "libavutil/tree.h"
 #include "nut.h"
-#include "avstring.h"
 
 #undef NDEBUG
 #include <assert.h>

Modified: trunk/libavformat/nutenc.c
==============================================================================
--- trunk/libavformat/nutenc.c	(original)
+++ trunk/libavformat/nutenc.c	Fri May  9 13:56:36 2008
@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/tree.h"
+#include "libavcodec/mpegaudiodata.h"
 #include "nut.h"
-#include "tree.h"
-#include "mpegaudiodata.h"
 
 static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint8_t out[64]){
     int sample_rate= c->sample_rate;

Modified: trunk/libavformat/oggenc.c
==============================================================================
--- trunk/libavformat/oggenc.c	(original)
+++ trunk/libavformat/oggenc.c	Fri May  9 13:56:36 2008
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/crc.h"
+#include "libavcodec/xiph.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "crc.h"
-#include "xiph.h"
-#include "bytestream.h"
 
 typedef struct {
     int64_t duration;

Modified: trunk/libavformat/oggparseflac.c
==============================================================================
--- trunk/libavformat/oggparseflac.c	(original)
+++ trunk/libavformat/oggparseflac.c	Fri May  9 13:56:36 2008
@@ -19,8 +19,8 @@
  */
 
 #include <stdlib.h>
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 #include "oggdec.h"
 
 #define FLAC_STREAMINFO_SIZE 0x22

Modified: trunk/libavformat/oggparseogm.c
==============================================================================
--- trunk/libavformat/oggparseogm.c	(original)
+++ trunk/libavformat/oggparseogm.c	Fri May  9 13:56:36 2008
@@ -23,10 +23,10 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/intreadwrite.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bytestream.h"
-#include "intreadwrite.h"
 #include "oggdec.h"
 #include "riff.h"
 

Modified: trunk/libavformat/oggparsespeex.c
==============================================================================
--- trunk/libavformat/oggparsespeex.c	(original)
+++ trunk/libavformat/oggparsespeex.c	Fri May  9 13:56:36 2008
@@ -23,12 +23,12 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/bswap.h"
+#include "libavutil/avstring.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bytestream.h"
-#include "bswap.h"
 #include "oggdec.h"
-#include "avstring.h"
 
 static int speex_header(AVFormatContext *s, int idx) {
     ogg_t *ogg = s->priv_data;

Modified: trunk/libavformat/oggparsetheora.c
==============================================================================
--- trunk/libavformat/oggparsetheora.c	(original)
+++ trunk/libavformat/oggparsetheora.c	Fri May  9 13:56:36 2008
@@ -23,9 +23,9 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/bswap.h"
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bswap.h"
 #include "oggdec.h"
 
 typedef struct theora_params {

Modified: trunk/libavformat/oggparsevorbis.c
==============================================================================
--- trunk/libavformat/oggparsevorbis.c	(original)
+++ trunk/libavformat/oggparsevorbis.c	Fri May  9 13:56:36 2008
@@ -23,12 +23,12 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/avstring.h"
+#include "libavutil/bswap.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bytestream.h"
-#include "bswap.h"
 #include "oggdec.h"
-#include "avstring.h"
 
 extern int
 vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)

Modified: trunk/libavformat/raw.c
==============================================================================
--- trunk/libavformat/raw.c	(original)
+++ trunk/libavformat/raw.c	Fri May  9 13:56:36 2008
@@ -19,12 +19,13 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/crc.h"
+#include "libavcodec/ac3_parser.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "ac3_parser.h"
 #include "raw.h"
-#include "crc.h"
-#include "bitstream.h"
-#include "bytestream.h"
 
 #ifdef CONFIG_MUXERS
 /* simple formats */

Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c	(original)
+++ trunk/libavformat/riff.c	Fri May  9 13:56:36 2008
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/avcodec.h"
 #include "avformat.h"
-#include "avcodec.h"
 #include "riff.h"
 
 /* Note: when encoding, the first matching tag is used, so order is

Modified: trunk/libavformat/riff.h
==============================================================================
--- trunk/libavformat/riff.h	(original)
+++ trunk/libavformat/riff.h	Fri May  9 13:56:36 2008
@@ -28,7 +28,7 @@
 #ifndef FFMPEG_RIFF_H
 #define FFMPEG_RIFF_H
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 #include "avio.h"
 
 offset_t start_tag(ByteIOContext *pb, const char *tag);

Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c	(original)
+++ trunk/libavformat/rmdec.c	Fri May  9 13:56:36 2008
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
 #include "avformat.h"
 #include "rm.h"
-#include "avstring.h"
 
 static inline void get_strl(ByteIOContext *pb, char *buf, int buf_size, int len)
 {

Modified: trunk/libavformat/rpl.c
==============================================================================
--- trunk/libavformat/rpl.c	(original)
+++ trunk/libavformat/rpl.c	Fri May  9 13:56:36 2008
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 #include <stdlib.h>
 
 #define RPL_SIGNATURE "ARMovie\x0A"

Modified: trunk/libavformat/rtp.c
==============================================================================
--- trunk/libavformat/rtp.c	(original)
+++ trunk/libavformat/rtp.c	Fri May  9 13:56:36 2008
@@ -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 "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 #include <unistd.h>
 #include "network.h"

Modified: trunk/libavformat/rtp.h
==============================================================================
--- trunk/libavformat/rtp.h	(original)
+++ trunk/libavformat/rtp.h	Fri May  9 13:56:36 2008
@@ -21,7 +21,7 @@
 #ifndef FFMPEG_RTP_H
 #define FFMPEG_RTP_H
 
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 #include "avformat.h"
 
 #define RTP_MIN_PACKET_LENGTH 12

Modified: trunk/libavformat/rtp_h264.c
==============================================================================
--- trunk/libavformat/rtp_h264.c	(original)
+++ trunk/libavformat/rtp_h264.c	Fri May  9 13:56:36 2008
@@ -36,9 +36,11 @@
  *
  */
 
+#include "libavutil/base64.h"
+#include "libavutil/avstring.h"
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
 #include "mpegts.h"
-#include "bitstream.h"
 
 #include <unistd.h>
 #include "network.h"
@@ -46,8 +48,6 @@
 
 #include "rtp_internal.h"
 #include "rtp_h264.h"
-#include "base64.h"
-#include "avstring.h"
 
 /**
     RTP/H264 specific private data.

Modified: trunk/libavformat/rtp_internal.h
==============================================================================
--- trunk/libavformat/rtp_internal.h	(original)
+++ trunk/libavformat/rtp_internal.h	Fri May  9 13:56:36 2008
@@ -24,7 +24,7 @@
 #define FFMPEG_RTP_INTERNAL_H
 
 #include <stdint.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 #include "rtp.h"
 
 // these statistics are used for rtcp receiver reports...

Modified: trunk/libavformat/rtp_mpv.c
==============================================================================
--- trunk/libavformat/rtp_mpv.c	(original)
+++ trunk/libavformat/rtp_mpv.c	Fri May  9 13:56:36 2008
@@ -19,11 +19,11 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/mpegvideo.h"
 #include "avformat.h"
 #include "rtp_internal.h"
 
-#include "mpegvideo.h"
-
 /* NOTE: a single frame must be passed with sequence header if
    needed. XXX: use slices. */
 void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)

Modified: trunk/libavformat/rtpdec.c
==============================================================================
--- trunk/libavformat/rtpdec.c	(original)
+++ trunk/libavformat/rtpdec.c	Fri May  9 13:56:36 2008
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
 #include "mpegts.h"
-#include "bitstream.h"
 
 #include <unistd.h>
 #include "network.h"

Modified: trunk/libavformat/rtpenc.c
==============================================================================
--- trunk/libavformat/rtpenc.c	(original)
+++ trunk/libavformat/rtpenc.c	Fri May  9 13:56:36 2008
@@ -18,9 +18,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavcodec/bitstream.h"
 #include "avformat.h"
 #include "mpegts.h"
-#include "bitstream.h"
 
 #include <unistd.h>
 #include "network.h"

Modified: trunk/libavformat/rtpproto.c
==============================================================================
--- trunk/libavformat/rtpproto.c	(original)
+++ trunk/libavformat/rtpproto.c	Fri May  9 13:56:36 2008
@@ -24,8 +24,8 @@
  * RTP protocol
  */
 
+#include "libavutil/avstring.h"
 #include "avformat.h"
-#include "avstring.h"
 
 #include <unistd.h>
 #include <stdarg.h>

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	(original)
+++ trunk/libavformat/rtsp.c	Fri May  9 13:56:36 2008
@@ -18,12 +18,13 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/avstring.h"
 #include "avformat.h"
 
 #include <sys/time.h>
 #include <unistd.h> /* for select() prototype */
 #include "network.h"
-#include "avstring.h"
 #include "rtsp.h"
 
 #include "rtp_internal.h"

Modified: trunk/libavformat/sdp.c
==============================================================================
--- trunk/libavformat/sdp.c	(original)
+++ trunk/libavformat/sdp.c	Fri May  9 13:56:36 2008
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avstring.h"
+#include "libavutil/avstring.h"
+#include "libavutil/base64.h"
 #include "avformat.h"
 #include "avc.h"
-#include "base64.h"
 #include "rtp.h"
 
 #ifdef CONFIG_RTP_MUXER

Modified: trunk/libavformat/smacker.c
==============================================================================
--- trunk/libavformat/smacker.c	(original)
+++ trunk/libavformat/smacker.c	Fri May  9 13:56:36 2008
@@ -23,9 +23,9 @@
  * Based on http://wiki.multimedia.cx/index.php?title=Smacker
  */
 
+#include "libavutil/bswap.h"
 #include "avformat.h"
 #include "riff.h"
-#include "bswap.h"
 
 #define SMACKER_PAL 0x01
 #define SMACKER_FLAG_RING_FRAME 0x01

Modified: trunk/libavformat/sol.c
==============================================================================
--- trunk/libavformat/sol.c	(original)
+++ trunk/libavformat/sol.c	Fri May  9 13:56:36 2008
@@ -23,10 +23,10 @@
  * Based on documents from Game Audio Player and own research
  */
 
+#include "libavutil/bswap.h"
 #include "avformat.h"
 #include "raw.h"
 #include "riff.h"
-#include "bswap.h"
 
 /* if we don't know the size in advance */
 #define AU_UNKNOWN_SIZE ((uint32_t)(~0))

Modified: trunk/libavformat/swf.c
==============================================================================
--- trunk/libavformat/swf.c	(original)
+++ trunk/libavformat/swf.c	Fri May  9 13:56:36 2008
@@ -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 "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 #include "riff.h"    /* for CodecTag */
 
 /* should have a generic way to indicate probable size */

Modified: trunk/libavformat/tta.c
==============================================================================
--- trunk/libavformat/tta.c	(original)
+++ trunk/libavformat/tta.c	Fri May  9 13:56:36 2008
@@ -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 "libavcodec/bitstream.h"
 #include "avformat.h"
-#include "bitstream.h"
 
 typedef struct {
     int totalframes, currentframe;

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Fri May  9 13:56:36 2008
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "opt.h"
-#include "avstring.h"
+#include "libavcodec/opt.h"
+#include "libavutil/avstring.h"
 #include "riff.h"
 #include <sys/time.h>
 #include <time.h>

Modified: trunk/libavformat/wv.c
==============================================================================
--- trunk/libavformat/wv.c	(original)
+++ trunk/libavformat/wv.c	Fri May  9 13:56:36 2008
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/bswap.h"
 #include "avformat.h"
-#include "bswap.h"
 
 // specs say that maximum block size is 1Mb
 #define WV_BLOCK_LIMIT 1047576

Modified: trunk/libpostproc/postprocess.c
==============================================================================
--- trunk/libpostproc/postprocess.c	(original)
+++ trunk/libpostproc/postprocess.c	Fri May  9 13:56:36 2008
@@ -74,7 +74,7 @@ try to unroll inner for(x=0 ... loop to 
 //Changelog: use the Subversion log
 
 #include "config.h"
-#include "avutil.h"
+#include "libavutil/avutil.h"
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/libpostproc/postprocess_altivec_template.c
==============================================================================
--- trunk/libpostproc/postprocess_altivec_template.c	(original)
+++ trunk/libpostproc/postprocess_altivec_template.c	Fri May  9 13:56:36 2008
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avutil.h"
+#include "libavutil/avutil.h"
 
 #define ALTIVEC_TRANSPOSE_8x8_SHORT(src_a,src_b,src_c,src_d,src_e,src_f,src_g,src_h) \
     do {                                                          \

Modified: trunk/libpostproc/postprocess_internal.h
==============================================================================
--- trunk/libpostproc/postprocess_internal.h	(original)
+++ trunk/libpostproc/postprocess_internal.h	Fri May  9 13:56:36 2008
@@ -26,7 +26,7 @@
 #ifndef FFMPEG_POSTPROCESS_INTERNAL_H
 #define FFMPEG_POSTPROCESS_INTERNAL_H
 
-#include "avutil.h"
+#include "libavutil/avutil.h"
 #include "postprocess.h"
 
 #define V_DEBLOCK       0x01

Modified: trunk/libpostproc/postprocess_template.c
==============================================================================
--- trunk/libpostproc/postprocess_template.c	(original)
+++ trunk/libpostproc/postprocess_template.c	Fri May  9 13:56:36 2008
@@ -23,7 +23,7 @@
  * mmx/mmx2/3dnow postprocess code.
  */
 
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
 
 #define ALIGN_MASK "$-8"
 

Modified: trunk/output_example.c
==============================================================================
--- trunk/output_example.c	(original)
+++ trunk/output_example.c	Fri May  9 13:56:36 2008
@@ -31,10 +31,13 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-#include "avformat.h"
-#include "swscale.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
 
 #undef exit
+#undef fprintf
+#undef printf
+#undef snprintf
 
 /* 5 seconds stream duration */
 #define STREAM_DURATION   5.0

Modified: trunk/tests/seek_test.c
==============================================================================
--- trunk/tests/seek_test.c	(original)
+++ trunk/tests/seek_test.c	Fri May  9 13:56:36 2008
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "avformat.h"
+#include "libavformat/avformat.h"
 
 #undef exit
 

Modified: trunk/vhook/drawtext.c
==============================================================================
--- trunk/vhook/drawtext.c	(original)
+++ trunk/vhook/drawtext.c	Fri May  9 13:56:36 2008
@@ -45,7 +45,7 @@
 
 #define MAXSIZE_TEXT 1024
 
-#include "framehook.h"
+#include "libavformat/framehook.h"
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/vhook/fish.c
==============================================================================
--- trunk/vhook/fish.c	(original)
+++ trunk/vhook/fish.c	Fri May  9 13:56:36 2008
@@ -44,10 +44,10 @@
 #include <stdio.h>
 #include <dirent.h>
 
-#include "framehook.h"
-#include "dsputil.h"
-#include "avformat.h"
-#include "swscale.h"
+#include "libavformat/avformat.h"
+#include "libavformat/framehook.h"
+#include "libavcodec/dsputil.h"
+#include "libswscale/swscale.h"
 
 static int sws_flags = SWS_BICUBIC;
 

Modified: trunk/vhook/imlib2.c
==============================================================================
--- trunk/vhook/imlib2.c	(original)
+++ trunk/vhook/imlib2.c	Fri May  9 13:56:36 2008
@@ -45,8 +45,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "framehook.h"
-#include "swscale.h"
+#include "libavformat/framehook.h"
+#include "libswscale/swscale.h"
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/vhook/null.c
==============================================================================
--- trunk/vhook/null.c	(original)
+++ trunk/vhook/null.c	Fri May  9 13:56:36 2008
@@ -20,8 +20,8 @@
  */
 #include <stdio.h>
 
-#include "framehook.h"
-#include "swscale.h"
+#include "libavformat/framehook.h"
+#include "libswscale/swscale.h"
 
 static int sws_flags = SWS_BICUBIC;
 

Modified: trunk/vhook/ppm.c
==============================================================================
--- trunk/vhook/ppm.c	(original)
+++ trunk/vhook/ppm.c	Fri May  9 13:56:36 2008
@@ -25,10 +25,10 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <ctype.h>
-#include "framehook.h"
-#include "avformat.h"
-#include "swscale.h"
-#include "avstring.h"
+#include "libavutil/avstring.h"
+#include "libavformat/framehook.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
 
 static int sws_flags = SWS_BICUBIC;
 

Modified: trunk/vhook/watermark.c
==============================================================================
--- trunk/vhook/watermark.c	(original)
+++ trunk/vhook/watermark.c	Fri May  9 13:56:36 2008
@@ -58,12 +58,11 @@
 #include <unistd.h>
 #include <stdarg.h>
 
-#include "common.h"
-#include "avformat.h"
-
-#include "framehook.h"
+#include "libavutil/common.h"
+#include "libavformat/avformat.h"
+#include "libavformat/framehook.h"
+#include "libswscale/swscale.h"
 #include "cmdutils.h"
-#include "swscale.h"
 
 static int sws_flags = SWS_BICUBIC;
 


