Use full path for #includes from another directory.

Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago · 245976da2a
parent 86b2d47fc0
commit 245976da2a
192 changed files with 351 additions and 319 deletions
--- a/cmdutils.c
+++ b/cmdutils.c
@ -25,14 +25,14 @@
 #include <math.h>
 #include "config.h"
-#include "avformat.h"
+#include "libavformat/avformat.h"
-#include "avfilter.h"
+#include "libavfilter/avfilter.h"
-#include "avdevice.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
--- a/ffmpeg.c
+++ b/ffmpeg.c
@ -27,14 +27,14 @@
 #include <errno.h>
 #include <signal.h>
 #include <limits.h>
-#include "avformat.h"
+#include "libavformat/avformat.h"
-#include "avdevice.h"
+#include "libavdevice/avdevice.h"
-#include "swscale.h"
+#include "libswscale/swscale.h"
-#include "framehook.h"
+#include "libavformat/framehook.h"
-#include "opt.h"
+#include "libavcodec/opt.h"
-#include "fifo.h"
+#include "libavutil/fifo.h"
-#include "avstring.h"
+#include "libavutil/avstring.h"
-#include "os_support.h"
+#include "libavformat/os_support.h"
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
--- a/ffplay.c
+++ b/ffplay.c
@ -21,11 +21,11 @@
 #include <math.h>
 #include <limits.h>
-#include "avformat.h"
+#include "libavutil/avstring.h"
-#include "avdevice.h"
+#include "libavformat/avformat.h"
-#include "rtsp.h"
+#include "libavformat/rtsp.h"
-#include "swscale.h"
+#include "libavdevice/avdevice.h"
-#include "avstring.h"
+#include "libswscale/swscale.h"
 #include "version.h"
 #include "cmdutils.h"
--- a/ffserver.c
+++ b/ffserver.c
@ -25,10 +25,13 @@
 #endif
 #include <string.h>
 #include <stdlib.h>
-#include "avformat.h"
+#include "libavutil/random.h"
-#include "rtsp.h"
+#include "libavutil/avstring.h"
-#include "rtp.h"
+#include "libavformat/avformat.h"
-#include "os_support.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
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@ -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
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@ -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 {
--- a/libavcodec/ac3tab.h
+++ b/libavcodec/ac3tab.h
@ -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];
--- a/libavcodec/alpha/dsputil_alpha.c
+++ b/libavcodec/alpha/dsputil_alpha.c
@ -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);
--- a/libavcodec/alpha/motion_est_alpha.c
+++ b/libavcodec/alpha/motion_est_alpha.c
@ -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)
--- a/libavcodec/alpha/mpegvideo_alpha.c
+++ b/libavcodec/alpha/mpegvideo_alpha.c
@ -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)
--- a/libavcodec/alpha/simple_idct_alpha.c
+++ b/libavcodec/alpha/simple_idct_alpha.c
@ -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);
--- a/libavcodec/armv4l/dsputil_arm.c
+++ b/libavcodec/armv4l/dsputil_arm.c
@ -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
--- a/libavcodec/armv4l/dsputil_iwmmxt.c
+++ b/libavcodec/armv4l/dsputil_iwmmxt.c
@ -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");
--- a/libavcodec/armv4l/mpegvideo_arm.c
+++ b/libavcodec/armv4l/mpegvideo_arm.c
@ -18,9 +18,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
-#include "mpegvideo.h"
+#include "libavcodec/dsputil.h"
-#include "avcodec.h"
+#include "libavcodec/mpegvideo.h"
 extern void MPV_common_init_iwmmxt(MpegEncContext *s);
 extern void MPV_common_init_armv5te(MpegEncContext *s);
--- a/libavcodec/armv4l/mpegvideo_armv5te.c
+++ b/libavcodec/armv4l/mpegvideo_armv5te.c
@ -19,9 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
-#include "mpegvideo.h"
+#include "libavcodec/dsputil.h"
-#include "avcodec.h"
+#include "libavcodec/mpegvideo.h"
 #ifdef ENABLE_ARM_TESTS
--- a/libavcodec/armv4l/mpegvideo_iwmmxt.c
+++ b/libavcodec/armv4l/mpegvideo_iwmmxt.c
@ -18,9 +18,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
-#include "mpegvideo.h"
+#include "libavcodec/dsputil.h"
-#include "avcodec.h"
+#include "libavcodec/mpegvideo.h"
 static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s,
                                             DCTELEM *block, int n, int qscale)
--- a/libavcodec/bethsoftvideo.c
+++ b/libavcodec/bethsoftvideo.c
@ -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"
--- a/libavcodec/bfi.c
+++ b/libavcodec/bfi.c
@ -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 {
--- a/libavcodec/bfin/dsputil_bfin.c
+++ b/libavcodec/bfin/dsputil_bfin.c
@ -22,8 +22,8 @@
 */
 #include <unistd.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "dsputil_bfin.h"
 int off;
--- a/libavcodec/bfin/mpegvideo_bfin.c
+++ b/libavcodec/bfin/mpegvideo_bfin.c
@ -20,9 +20,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
-#include "mpegvideo.h"
+#include "libavcodec/dsputil.h"
-#include "avcodec.h"
+#include "libavcodec/mpegvideo.h"
 #include "dsputil_bfin.h"
--- a/libavcodec/bfin/vp3_bfin.c
+++ b/libavcodec/bfin/vp3_bfin.c
@ -18,8 +18,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "dsputil_bfin.h"
 extern void ff_bfin_vp3_idct (DCTELEM *block) attribute_l1_text;
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@ -29,10 +29,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "common.h"
+#include "libavutil/bswap.h"
-#include "bswap.h"
+#include "libavutil/common.h"
-#include "intreadwrite.h"
+#include "libavutil/intreadwrite.h"
-#include "log.h"
+#include "libavutil/log.h"
 #if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER)
 #   define ALT_BITSTREAM_READER
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@ -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){\
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@ -26,7 +26,7 @@
 #include <string.h>
-#include "common.h"
+#include "libavutil/common.h"
 #include "bitstream.h"
 #include "cabac.h"
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@ -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
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@ -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"
--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@ -26,7 +26,7 @@
 #ifdef CONFIG_ZLIB
 #include <zlib.h>
 #endif
-#include "lzo.h"
+#include "libavutil/lzo.h"
 typedef struct {
    AVFrame pic;
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@ -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
--- a/libavcodec/elbg.c
+++ b/libavcodec/elbg.c
@ -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)
--- a/libavcodec/elbg.h
+++ b/libavcodec/elbg.h
@ -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
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@ -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
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@ -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
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@ -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
--- a/libavcodec/golomb.c
+++ b/libavcodec/golomb.c
@ -26,7 +26,7 @@
 * @author Michael Niedermayer <michaelni@gmx.at>
 */
-#include "common.h"
+#include "libavutil/common.h"
 const uint8_t ff_golomb_vlc_len[512]={
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@ -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
--- a/libavcodec/h264enc.c
+++ b/libavcodec/h264enc.c
@ -17,7 +17,7 @@
 */
-#include "common.h"
+#include "libavutil/common.h"
 #include "bitstream.h"
 #include "mpegvideo.h"
 #include "h264data.h"
--- a/libavcodec/h264pred.h
+++ b/libavcodec/h264pred.h
@ -28,7 +28,7 @@
 #ifndef FFMPEG_H264PRED_H
 #define FFMPEG_H264PRED_H
-#include "common.h"
+#include "libavutil/common.h"
 /**
 * Prediction types
--- a/libavcodec/i386/cavsdsp_mmx.c
+++ b/libavcodec/i386/cavsdsp_mmx.c
@ -22,10 +22,10 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+#include "libavutil/common.h"
 #include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
 #include "dsputil_mmx.h"
 #include "common.h"
 #include "x86_cpu.h"
 /*****************************************************************************
 *
--- a/libavcodec/i386/cpuid.c
+++ b/libavcodec/i386/cpuid.c
@ -21,8 +21,8 @@
 */
 #include <stdlib.h>
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
-#include "x86_cpu.h"
+#include "libavcodec/dsputil.h"
 #undef printf
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@ -22,16 +22,16 @@
 * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
 */
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
 #include "libavcodec/h263.h"
 #include "libavcodec/mpegvideo.h"
 #include "libavcodec/simple_idct.h"
 #include "dsputil_mmx.h"
 #include "simple_idct.h"
 #include "mpegvideo.h"
 #include "x86_cpu.h"
 #include "mmx.h"
 #include "vp3dsp_mmx.h"
 #include "vp3dsp_sse2.h"
 #include "idct_xvid.h"
 #include "h263.h"
 //#undef NDEBUG
 //#include <assert.h>
--- a/libavcodec/i386/dsputil_mmx.h
+++ b/libavcodec/i386/dsputil_mmx.h
@ -23,7 +23,7 @@
 #define FFMPEG_DSPUTIL_MMX_H
 #include <stdint.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 typedef struct { uint64_t a, b; } xmm_t;
--- a/libavcodec/i386/dsputilenc_mmx.c
+++ b/libavcodec/i386/dsputilenc_mmx.c
@ -22,10 +22,10 @@
 * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
 */
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "dsputil_mmx.h"
 #include "mpegvideo.h"
 #include "x86_cpu.h"
 static void get_pixels_mmx(DCTELEM *block, const uint8_t *pixels, int line_size)
--- a/libavcodec/i386/fdct_mmx.c
+++ b/libavcodec/i386/fdct_mmx.c
@ -29,8 +29,9 @@
 * License along with FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "common.h"
+
-#include "dsputil.h"
+#include "libavutil/common.h"
 #include "libavcodec/dsputil.h"
 #include "mmx.h"
 #define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))
--- a/libavcodec/i386/fft_3dn.c
+++ b/libavcodec/i386/fft_3dn.c
@ -19,8 +19,9 @@
 * License along with FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
 static const int p1m1[2] __attribute__((aligned(8))) =
    { 0, 1 << 31 };
--- a/libavcodec/i386/fft_3dn2.c
+++ b/libavcodec/i386/fft_3dn2.c
@ -19,8 +19,9 @@
 * License along with FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
 static const int p1m1[2] __attribute__((aligned(8))) =
    { 0, 1 << 31 };
--- a/libavcodec/i386/fft_sse.c
+++ b/libavcodec/i386/fft_sse.c
@ -18,8 +18,9 @@
 * License along with FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
 static const int p1p1p1m1[4] __attribute__((aligned(16))) =
    { 0, 0, 0, 1 << 31 };
--- a/libavcodec/i386/flacdsp_mmx.c
+++ b/libavcodec/i386/flacdsp_mmx.c
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 #include "libavutil/x86_cpu.h"
 #include "dsputil_mmx.h"
 #include "x86_cpu.h"
 static void apply_welch_window_sse2(const int32_t *data, int len, double *w_data)
 {
--- a/libavcodec/i386/h264_i386.h
+++ b/libavcodec/i386/h264_i386.h
@ -29,8 +29,7 @@
 #ifndef FFMPEG_H264_I386_H
 #define FFMPEG_H264_I386_H
-
+#include "libavcodec/cabac.h"
 #include "cabac.h"
 //FIXME use some macros to avoid duplicating get_cabac (cannot be done yet
 //as that would make optimization work hard)
--- a/libavcodec/i386/idct_mmx.c
+++ b/libavcodec/i386/idct_mmx.c
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "common.h"
+#include "libavutil/common.h"
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "mmx.h"
--- a/libavcodec/i386/idct_mmx_xvid.c
+++ b/libavcodec/i386/idct_mmx_xvid.c
@ -40,7 +40,7 @@
 */
 #include <inttypes.h>
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
 //=============================================================================
 // Macros and other preprocessor constants
--- a/libavcodec/i386/idct_sse2_xvid.c
+++ b/libavcodec/i386/idct_sse2_xvid.c
@ -38,7 +38,7 @@
 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 /*!
 * @file idct_sse2_xvid.c
--- a/libavcodec/i386/motion_est_mmx.c
+++ b/libavcodec/i386/motion_est_mmx.c
@ -21,8 +21,9 @@
 * License along with FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+
-#include "x86_cpu.h"
+#include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
 DECLARE_ASM_CONST(8, uint64_t, round_tab[3])={
 0x0000000000000000ULL,
--- a/libavcodec/i386/mpegvideo_mmx.c
+++ b/libavcodec/i386/mpegvideo_mmx.c
@ -22,11 +22,11 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "dsputil_mmx.h"
 #include "mpegvideo.h"
 #include "avcodec.h"
 #include "x86_cpu.h"
 extern uint16_t inv_zigzag_direct16[64];
--- a/libavcodec/i386/simple_idct_mmx.c
+++ b/libavcodec/i386/simple_idct_mmx.c
@ -19,8 +19,8 @@
 * License along with FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
-#include "simple_idct.h"
+#include "libavcodec/simple_idct.h"
 /*
 23170.475006
--- a/libavcodec/i386/snowdsp_mmx.c
+++ b/libavcodec/i386/snowdsp_mmx.c
@ -19,9 +19,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "avcodec.h"
+#include "libavutil/x86_cpu.h"
-#include "snow.h"
+#include "libavcodec/avcodec.h"
-#include "x86_cpu.h"
+#include "libavcodec/snow.h"
 void ff_snow_horizontal_compose97i_sse2(IDWTELEM *b, int width){
    const int w2= (width+1)>>1;
--- a/libavcodec/i386/vc1dsp_mmx.c
+++ b/libavcodec/i386/vc1dsp_mmx.c
@ -24,9 +24,9 @@
 * OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "dsputil.h"
+#include "libavutil/x86_cpu.h"
 #include "libavcodec/dsputil.h"
 #include "dsputil_mmx.h"
 #include "x86_cpu.h"
 /** Add rounder from mm7 to mm3 and pack result at destination */
 #define NORMALIZE_MMX(SHIFT)                                    \
--- a/libavcodec/i386/vp3dsp_mmx.c
+++ b/libavcodec/i386/vp3dsp_mmx.c
@ -23,7 +23,7 @@
 * MMX-optimized functions cribbed from the original VP3 source code.
 */
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "mmx.h"
 #define IdctAdjustBeforeShift 8
--- a/libavcodec/i386/vp3dsp_sse2.c
+++ b/libavcodec/i386/vp3dsp_sse2.c
@ -23,7 +23,7 @@
 * SSE2-optimized functions cribbed from the original VP3 source code.
 */
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "mmx.h"
 static DECLARE_ALIGNED_16(const unsigned short, SSE2_dequant_const[]) =
--- a/libavcodec/i386/vp3dsp_sse2.h
+++ b/libavcodec/i386/vp3dsp_sse2.h
@ -22,7 +22,7 @@
 #ifndef FFMPEG_VP3DSP_SSE2_H
 #define FFMPEG_VP3DSP_SSE2_H
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 void ff_vp3_idct_sse2(int16_t *input_data);
 void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);
--- a/libavcodec/jfdctfst.c
+++ b/libavcodec/jfdctfst.c
@ -70,7 +70,7 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 #define DCTSIZE 8
--- a/libavcodec/jfdctint.c
+++ b/libavcodec/jfdctint.c
@ -63,7 +63,7 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 #define SHIFT_TEMPS
--- a/libavcodec/jrevdct.c
+++ b/libavcodec/jrevdct.c
@ -64,7 +64,7 @@
 * Independent JPEG Group's LLM idct.
 */
-#include "common.h"
+#include "libavutil/common.h"
 #include "dsputil.h"
 #define EIGHT_BIT_SAMPLES
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@ -31,8 +31,8 @@
 */
 /* FFmpeg includes */
 #include "libavutil/log.h"
 #include "avcodec.h"
 #include "log.h"
 /* libtheora includes */
 #include <theora/theora.h>
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@ -22,7 +22,7 @@
 #ifndef FFMPEG_MATHOPS_H
 #define FFMPEG_MATHOPS_H
-#include "common.h"
+#include "libavutil/common.h"
 #ifdef ARCH_X86_32
--- a/libavcodec/mlib/dsputil_mlib.c
+++ b/libavcodec/mlib/dsputil_mlib.c
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
-#include "mpegvideo.h"
+#include "libavcodec/mpegvideo.h"
 #include <mlib_types.h>
 #include <mlib_status.h>
--- a/libavcodec/mlp_parser.c
+++ b/libavcodec/mlp_parser.c
@ -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] = {
--- a/libavcodec/mpc.c
+++ b/libavcodec/mpc.c
@ -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
--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@ -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
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@ -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
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@ -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
--- a/libavcodec/mpeg12data.h
+++ b/libavcodec/mpeg12data.h
@ -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];
--- a/libavcodec/mpegaudiodata.h
+++ b/libavcodec/mpegaudiodata.h
@ -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
--- a/libavcodec/mpegaudiodecheader.h
+++ b/libavcodec/mpegaudiodecheader.h
@ -27,7 +27,7 @@
 #ifndef FFMPEG_MPEGAUDIODECHEADER_H
 #define FFMPEG_MPEGAUDIODECHEADER_H
-#include "common.h"
+#include "libavutil/common.h"
 #include "mpegaudio.h"
--- a/libavcodec/msmpeg4data.h
+++ b/libavcodec/msmpeg4data.h
@ -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"
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@ -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
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@ -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 {
--- a/libavcodec/ppc/dsputil_altivec.c
+++ b/libavcodec/ppc/dsputil_altivec.c
@ -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"
--- a/libavcodec/ppc/dsputil_ppc.c
+++ b/libavcodec/ppc/dsputil_ppc.c
@ -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"
--- a/libavcodec/ppc/fdct_altivec.c
+++ b/libavcodec/ppc/fdct_altivec.c
@ -20,8 +20,8 @@
 */
-#include "common.h"
+#include "libavutil/common.h"
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "dsputil_ppc.h"
 #include "gcc_fixes.h"
--- a/libavcodec/ppc/fft_altivec.c
+++ b/libavcodec/ppc/fft_altivec.c
@ -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"
--- a/libavcodec/ppc/float_altivec.c
+++ b/libavcodec/ppc/float_altivec.c
@ -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"
--- a/libavcodec/ppc/gmc_altivec.c
+++ b/libavcodec/ppc/gmc_altivec.c
@ -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"
--- a/libavcodec/ppc/h264_altivec.c
+++ b/libavcodec/ppc/h264_altivec.c
@ -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"
--- a/libavcodec/ppc/idct_altivec.c
+++ b/libavcodec/ppc/idct_altivec.c
@ -38,7 +38,7 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "gcc_fixes.h"
--- a/libavcodec/ppc/int_altivec.c
+++ b/libavcodec/ppc/int_altivec.c
@ -23,7 +23,7 @@
 ** integer misc ops.
 **/
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "gcc_fixes.h"
--- a/libavcodec/ppc/mpegvideo_altivec.c
+++ b/libavcodec/ppc/mpegvideo_altivec.c
@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
-#include "mpegvideo.h"
+#include "libavcodec/mpegvideo.h"
 #include "gcc_fixes.h"
--- a/libavcodec/ppc/snow_altivec.c
+++ b/libavcodec/ppc/snow_altivec.c
@ -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>
--- a/libavcodec/ppc/vc1dsp_altivec.c
+++ b/libavcodec/ppc/vc1dsp_altivec.c
@ -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"
--- a/libavcodec/ps2/dsputil_mmi.c
+++ b/libavcodec/ps2/dsputil_mmi.c
@ -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);
--- a/libavcodec/ps2/idct_mmi.c
+++ b/libavcodec/ps2/idct_mmi.c
@ -25,8 +25,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "common.h"
+#include "libavutil/common.h"
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "mmi.h"
 #define BITS_INV_ACC    5       // 4 or 5 for IEEE
--- a/libavcodec/ps2/mpegvideo_mmi.c
+++ b/libavcodec/ps2/mpegvideo_mmi.c
@ -20,9 +20,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "dsputil.h"
+#include "libavcodec/avcodec.h"
-#include "mpegvideo.h"
+#include "libavcodec/dsputil.h"
-#include "avcodec.h"
+#include "libavcodec/mpegvideo.h"
 static void dct_unquantize_h263_mmi(MpegEncContext *s,
                                  DCTELEM *block, int n, int qscale)
--- a/libavcodec/rangecoder.h
+++ b/libavcodec/rangecoder.h
@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <assert.h>
-#include "common.h"
+#include "libavutil/common.h"
 typedef struct RangeCoder{
    int low;
--- a/libavcodec/rectangle.h
+++ b/libavcodec/rectangle.h
@ -28,7 +28,7 @@
 #ifndef FFMPEG_RECTANGLE_H
 #define FFMPEG_RECTANGLE_H
-#include "common.h"
+#include "libavutil/common.h"
 /**
 * fill a rectangle.
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@ -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];
--- a/libavcodec/rtjpeg.c
+++ b/libavcodec/rtjpeg.c
@ -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"
--- a/libavcodec/sh4/dsputil_align.c
+++ b/libavcodec/sh4/dsputil_align.c
@ -21,8 +21,8 @@
 */
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #define         LP(p)           *(uint32_t*)(p)
--- a/libavcodec/sh4/dsputil_sh4.c
+++ b/libavcodec/sh4/dsputil_sh4.c
@ -20,8 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "avcodec.h"
+#include "libavcodec/avcodec.h"
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 static void memzero_align8(void *dst,size_t size)
 {
--- a/libavcodec/sh4/idct_sh4.c
+++ b/libavcodec/sh4/idct_sh4.c
@ -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) */
--- a/libavcodec/sparc/dsputil_vis.c
+++ b/libavcodec/sparc/dsputil_vis.c
@ -27,7 +27,7 @@
 #include <inttypes.h>
-#include "dsputil.h"
+#include "libavcodec/dsputil.h"
 #include "vis.h"
--- a/libavcodec/sparc/simple_idct_vis.c
+++ b/libavcodec/sparc/simple_idct_vis.c
@ -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,
--- a/Show More
+++ b/Show More