From b550bfaa618da17c63c0ef132f938beaaaf0a3dc Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 16 May 2007 09:51:45 +0000 Subject: Add libavcodec to compiler include flags in order to simplify header include paths in the source files. mostly from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net Originally committed as revision 9034 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/Makefile | 2 +- libavcodec/alpha/dsputil_alpha.c | 2 +- libavcodec/alpha/motion_est_alpha.c | 2 +- libavcodec/alpha/mpegvideo_alpha.c | 4 ++-- libavcodec/alpha/simple_idct_alpha.c | 2 +- libavcodec/armv4l/dsputil_arm.c | 2 +- libavcodec/armv4l/dsputil_iwmmxt.c | 2 +- libavcodec/armv4l/mpegvideo_arm.c | 6 +++--- libavcodec/armv4l/mpegvideo_armv5te.c | 6 +++--- libavcodec/armv4l/mpegvideo_iwmmxt.c | 6 +++--- libavcodec/bfin/dsputil_bfin.c | 4 ++-- libavcodec/i386/cavsdsp_mmx.c | 2 +- libavcodec/i386/cputest.c | 2 +- libavcodec/i386/dsputil_mmx.c | 6 +++--- libavcodec/i386/fdct_mmx.c | 2 +- libavcodec/i386/fft_3dn.c | 2 +- libavcodec/i386/fft_3dn2.c | 2 +- libavcodec/i386/fft_sse.c | 2 +- libavcodec/i386/idct_mmx.c | 2 +- libavcodec/i386/idct_mmx_xvid.c | 2 +- libavcodec/i386/motion_est_mmx.c | 2 +- libavcodec/i386/mpegvideo_mmx.c | 6 +++--- libavcodec/i386/simple_idct_mmx.c | 4 ++-- libavcodec/i386/snowdsp_mmx.c | 4 ++-- libavcodec/i386/vp3dsp_mmx.c | 2 +- libavcodec/i386/vp3dsp_sse2.c | 2 +- libavcodec/mlib/dsputil_mlib.c | 4 ++-- libavcodec/ppc/dsputil_altivec.c | 2 +- libavcodec/ppc/dsputil_ppc.c | 2 +- libavcodec/ppc/fdct_altivec.c | 2 +- libavcodec/ppc/fft_altivec.c | 2 +- libavcodec/ppc/float_altivec.c | 2 +- libavcodec/ppc/gmc_altivec.c | 2 +- libavcodec/ppc/h264_altivec.c | 2 +- libavcodec/ppc/idct_altivec.c | 2 +- libavcodec/ppc/int_altivec.c | 2 +- libavcodec/ppc/mpegvideo_altivec.c | 4 ++-- libavcodec/ppc/mpegvideo_ppc.c | 4 ++-- libavcodec/ppc/snow_altivec.c | 4 ++-- libavcodec/ppc/vc1dsp_altivec.c | 2 +- libavcodec/ps2/dsputil_mmi.c | 2 +- libavcodec/ps2/idct_mmi.c | 4 ++-- libavcodec/ps2/mpegvideo_mmi.c | 6 +++--- libavcodec/sh4/dsputil_align.c | 4 ++-- libavcodec/sh4/dsputil_sh4.c | 4 ++-- libavcodec/sh4/idct_sh4.c | 2 +- libavcodec/sparc/dsputil_vis.c | 2 +- 47 files changed, 70 insertions(+), 70 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f096a74703..32c85ecf9e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -4,7 +4,7 @@ # include ../config.mak -CFLAGS+=-I$(SRC_PATH)/libswscale +CFLAGS+=-I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec OBJS= bitstream.o \ utils.o \ diff --git a/libavcodec/alpha/dsputil_alpha.c b/libavcodec/alpha/dsputil_alpha.c index c98d6f7ff8..36357356ed 100644 --- a/libavcodec/alpha/dsputil_alpha.c +++ b/libavcodec/alpha/dsputil_alpha.c @@ -20,7 +20,7 @@ */ #include "asm.h" -#include "../dsputil.h" +#include "dsputil.h" extern void simple_idct_axp(DCTELEM *block); extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block); diff --git a/libavcodec/alpha/motion_est_alpha.c b/libavcodec/alpha/motion_est_alpha.c index 337ffb38e2..b23338c09a 100644 --- a/libavcodec/alpha/motion_est_alpha.c +++ b/libavcodec/alpha/motion_est_alpha.c @@ -20,7 +20,7 @@ */ #include "asm.h" -#include "../dsputil.h" +#include "dsputil.h" void get_pixels_mvi(DCTELEM *restrict block, const uint8_t *restrict pixels, int line_size) diff --git a/libavcodec/alpha/mpegvideo_alpha.c b/libavcodec/alpha/mpegvideo_alpha.c index 8ad264b06f..9aa20f420b 100644 --- a/libavcodec/alpha/mpegvideo_alpha.c +++ b/libavcodec/alpha/mpegvideo_alpha.c @@ -20,8 +20,8 @@ */ #include "asm.h" -#include "../dsputil.h" -#include "../mpegvideo.h" +#include "dsputil.h" +#include "mpegvideo.h" static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block, int n, int qscale) diff --git a/libavcodec/alpha/simple_idct_alpha.c b/libavcodec/alpha/simple_idct_alpha.c index adadd3ab0c..7c4a0d578e 100644 --- a/libavcodec/alpha/simple_idct_alpha.c +++ b/libavcodec/alpha/simple_idct_alpha.c @@ -27,7 +27,7 @@ */ #include "asm.h" -#include "../dsputil.h" +#include "dsputil.h" extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, int line_size); diff --git a/libavcodec/armv4l/dsputil_arm.c b/libavcodec/armv4l/dsputil_arm.c index 61b5fdacc4..ac4dab211a 100644 --- 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 "dsputil.h" #ifdef HAVE_IPP #include "ipp.h" #endif diff --git a/libavcodec/armv4l/dsputil_iwmmxt.c b/libavcodec/armv4l/dsputil_iwmmxt.c index 7b28db5bb5..62dcfab0c1 100644 --- 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 "dsputil.h" #define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt #define SET_RND(regd) __asm__ __volatile__ ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12"); diff --git a/libavcodec/armv4l/mpegvideo_arm.c b/libavcodec/armv4l/mpegvideo_arm.c index 22d40d8bcf..3371ed7ce5 100644 --- a/libavcodec/armv4l/mpegvideo_arm.c +++ b/libavcodec/armv4l/mpegvideo_arm.c @@ -19,9 +19,9 @@ * */ -#include "../dsputil.h" -#include "../mpegvideo.h" -#include "../avcodec.h" +#include "dsputil.h" +#include "mpegvideo.h" +#include "avcodec.h" extern void MPV_common_init_iwmmxt(MpegEncContext *s); extern void MPV_common_init_armv5te(MpegEncContext *s); diff --git a/libavcodec/armv4l/mpegvideo_armv5te.c b/libavcodec/armv4l/mpegvideo_armv5te.c index 5e83c8a438..9f9f6ed473 100644 --- a/libavcodec/armv4l/mpegvideo_armv5te.c +++ b/libavcodec/armv4l/mpegvideo_armv5te.c @@ -25,9 +25,9 @@ * Instructions timings and optimization guide for ARM9E: http://www.arm.com/pdfs/DDI0222B_9EJS_r1p2.pdf */ -#include "../dsputil.h" -#include "../mpegvideo.h" -#include "../avcodec.h" +#include "dsputil.h" +#include "mpegvideo.h" +#include "avcodec.h" #ifdef ENABLE_ARM_TESTS diff --git a/libavcodec/armv4l/mpegvideo_iwmmxt.c b/libavcodec/armv4l/mpegvideo_iwmmxt.c index 1336ac5f8d..9e11213913 100644 --- 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 "../mpegvideo.h" -#include "../avcodec.h" +#include "dsputil.h" +#include "mpegvideo.h" +#include "avcodec.h" static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s, DCTELEM *block, int n, int qscale) diff --git a/libavcodec/bfin/dsputil_bfin.c b/libavcodec/bfin/dsputil_bfin.c index 2aebc2016e..312c06c3a8 100644 --- a/libavcodec/bfin/dsputil_bfin.c +++ b/libavcodec/bfin/dsputil_bfin.c @@ -23,8 +23,8 @@ #include #include -#include "../avcodec.h" -#include "../dsputil.h" +#include "avcodec.h" +#include "dsputil.h" #define USE_L1CODE diff --git a/libavcodec/i386/cavsdsp_mmx.c b/libavcodec/i386/cavsdsp_mmx.c index 51d519a5ca..30bab38c02 100644 --- a/libavcodec/i386/cavsdsp_mmx.c +++ b/libavcodec/i386/cavsdsp_mmx.c @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../dsputil.h" +#include "dsputil.h" #include "common.h" DECLARE_ALIGNED_8(static const uint64_t,ff_pw_4 ) = 0x0004000400040004ULL; diff --git a/libavcodec/i386/cputest.c b/libavcodec/i386/cputest.c index 0705ab3e54..fe751fb5b8 100644 --- a/libavcodec/i386/cputest.c +++ b/libavcodec/i386/cputest.c @@ -21,7 +21,7 @@ */ #include -#include "../dsputil.h" +#include "dsputil.h" #undef printf diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c index 9b81b2d610..063d0237b0 100644 --- a/libavcodec/i386/dsputil_mmx.c +++ b/libavcodec/i386/dsputil_mmx.c @@ -22,9 +22,9 @@ * MMX optimization by Nick Kurshev */ -#include "../dsputil.h" -#include "../simple_idct.h" -#include "../mpegvideo.h" +#include "dsputil.h" +#include "simple_idct.h" +#include "mpegvideo.h" #include "x86_cpu.h" #include "mmx.h" diff --git a/libavcodec/i386/fdct_mmx.c b/libavcodec/i386/fdct_mmx.c index 69e75b23cf..a034c9f949 100644 --- a/libavcodec/i386/fdct_mmx.c +++ b/libavcodec/i386/fdct_mmx.c @@ -30,7 +30,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "common.h" -#include "../dsputil.h" +#include "dsputil.h" #include "mmx.h" #define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align))) diff --git a/libavcodec/i386/fft_3dn.c b/libavcodec/i386/fft_3dn.c index 8087f1932c..4231d855af 100644 --- a/libavcodec/i386/fft_3dn.c +++ b/libavcodec/i386/fft_3dn.c @@ -19,7 +19,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 "dsputil.h" static const int p1m1[2] __attribute__((aligned(8))) = { 0, 1 << 31 }; diff --git a/libavcodec/i386/fft_3dn2.c b/libavcodec/i386/fft_3dn2.c index a4fe5f0b68..6d063321d7 100644 --- a/libavcodec/i386/fft_3dn2.c +++ b/libavcodec/i386/fft_3dn2.c @@ -19,7 +19,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 "dsputil.h" static const int p1m1[2] __attribute__((aligned(8))) = { 0, 1 << 31 }; diff --git a/libavcodec/i386/fft_sse.c b/libavcodec/i386/fft_sse.c index a5ae9c8c4a..966b8a93f5 100644 --- a/libavcodec/i386/fft_sse.c +++ b/libavcodec/i386/fft_sse.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 "../dsputil.h" +#include "dsputil.h" static const int p1p1p1m1[4] __attribute__((aligned(16))) = { 0, 0, 0, 1 << 31 }; diff --git a/libavcodec/i386/idct_mmx.c b/libavcodec/i386/idct_mmx.c index 4c548fdcee..b3a5267f42 100644 --- a/libavcodec/i386/idct_mmx.c +++ b/libavcodec/i386/idct_mmx.c @@ -20,7 +20,7 @@ */ #include "common.h" -#include "../dsputil.h" +#include "dsputil.h" #include "mmx.h" diff --git a/libavcodec/i386/idct_mmx_xvid.c b/libavcodec/i386/idct_mmx_xvid.c index 65ece6de9c..1e7ea3e7fa 100644 --- a/libavcodec/i386/idct_mmx_xvid.c +++ b/libavcodec/i386/idct_mmx_xvid.c @@ -50,7 +50,7 @@ #include -#include "../avcodec.h" +#include "avcodec.h" //============================================================================= // Macros and other preprocessor constants diff --git a/libavcodec/i386/motion_est_mmx.c b/libavcodec/i386/motion_est_mmx.c index e280b34d70..e43cacdcc2 100644 --- a/libavcodec/i386/motion_est_mmx.c +++ b/libavcodec/i386/motion_est_mmx.c @@ -21,7 +21,7 @@ * * mostly by Michael Niedermayer */ -#include "../dsputil.h" +#include "dsputil.h" #include "x86_cpu.h" static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={ diff --git a/libavcodec/i386/mpegvideo_mmx.c b/libavcodec/i386/mpegvideo_mmx.c index f8bdcc6e50..d5316877be 100644 --- a/libavcodec/i386/mpegvideo_mmx.c +++ b/libavcodec/i386/mpegvideo_mmx.c @@ -22,9 +22,9 @@ * h263, mpeg1, mpeg2 dequantizer & draw_edges by Michael Niedermayer */ -#include "../dsputil.h" -#include "../mpegvideo.h" -#include "../avcodec.h" +#include "dsputil.h" +#include "mpegvideo.h" +#include "avcodec.h" #include "x86_cpu.h" extern uint16_t inv_zigzag_direct16[64]; diff --git a/libavcodec/i386/simple_idct_mmx.c b/libavcodec/i386/simple_idct_mmx.c index 525ef34f7c..dd22ee8aa3 100644 --- a/libavcodec/i386/simple_idct_mmx.c +++ b/libavcodec/i386/simple_idct_mmx.c @@ -19,8 +19,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../dsputil.h" -#include "../simple_idct.h" +#include "dsputil.h" +#include "simple_idct.h" /* 23170.475006 diff --git a/libavcodec/i386/snowdsp_mmx.c b/libavcodec/i386/snowdsp_mmx.c index 8f182303d5..1d5a4f4ff7 100644 --- a/libavcodec/i386/snowdsp_mmx.c +++ b/libavcodec/i386/snowdsp_mmx.c @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../avcodec.h" -#include "../snow.h" +#include "avcodec.h" +#include "snow.h" #include "x86_cpu.h" void ff_snow_horizontal_compose97i_sse2(DWTELEM *b, int width){ diff --git a/libavcodec/i386/vp3dsp_mmx.c b/libavcodec/i386/vp3dsp_mmx.c index f715dc803d..363ea02e3b 100644 --- a/libavcodec/i386/vp3dsp_mmx.c +++ b/libavcodec/i386/vp3dsp_mmx.c @@ -23,7 +23,7 @@ * MMX-optimized functions cribbed from the original VP3 source code. */ -#include "../dsputil.h" +#include "dsputil.h" #include "mmx.h" #define IdctAdjustBeforeShift 8 diff --git a/libavcodec/i386/vp3dsp_sse2.c b/libavcodec/i386/vp3dsp_sse2.c index bd2911d599..8da2e68653 100644 --- a/libavcodec/i386/vp3dsp_sse2.c +++ b/libavcodec/i386/vp3dsp_sse2.c @@ -23,7 +23,7 @@ * SSE2-optimized functions cribbed from the original VP3 source code. */ -#include "../dsputil.h" +#include "dsputil.h" #include "mmx.h" static DECLARE_ALIGNED_16(const unsigned short, SSE2_dequant_const[]) = diff --git a/libavcodec/mlib/dsputil_mlib.c b/libavcodec/mlib/dsputil_mlib.c index b78a54e0e5..1b1b5345a8 100644 --- 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 "../mpegvideo.h" +#include "dsputil.h" +#include "mpegvideo.h" #include #include diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c index bbc53d7619..78d736171f 100644 --- 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 "dsputil.h" #include "gcc_fixes.h" diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 4d5e28996b..ae08368f42 100644 --- 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 "dsputil.h" #include "dsputil_ppc.h" diff --git a/libavcodec/ppc/fdct_altivec.c b/libavcodec/ppc/fdct_altivec.c index 2418c32bb6..cb9446d391 100644 --- a/libavcodec/ppc/fdct_altivec.c +++ b/libavcodec/ppc/fdct_altivec.c @@ -21,7 +21,7 @@ #include "common.h" -#include "../dsputil.h" +#include "dsputil.h" #include "dsputil_altivec.h" #include "gcc_fixes.h" diff --git a/libavcodec/ppc/fft_altivec.c b/libavcodec/ppc/fft_altivec.c index 384a774ff1..62de81f5d8 100644 --- 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 "dsputil.h" #include "gcc_fixes.h" diff --git a/libavcodec/ppc/float_altivec.c b/libavcodec/ppc/float_altivec.c index 22c2de61a7..750e6d7f90 100644 --- 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 "dsputil.h" #include "gcc_fixes.h" diff --git a/libavcodec/ppc/gmc_altivec.c b/libavcodec/ppc/gmc_altivec.c index 42c936bb33..4b74284471 100644 --- 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 "dsputil.h" #include "gcc_fixes.h" diff --git a/libavcodec/ppc/h264_altivec.c b/libavcodec/ppc/h264_altivec.c index bac620e82a..963c6083ae 100644 --- 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 "dsputil.h" #include "gcc_fixes.h" diff --git a/libavcodec/ppc/idct_altivec.c b/libavcodec/ppc/idct_altivec.c index 66c8082f76..c4e0cfd0a2 100644 --- a/libavcodec/ppc/idct_altivec.c +++ b/libavcodec/ppc/idct_altivec.c @@ -39,7 +39,7 @@ #include /* malloc(), free() */ #include -#include "../dsputil.h" +#include "dsputil.h" #include "gcc_fixes.h" diff --git a/libavcodec/ppc/int_altivec.c b/libavcodec/ppc/int_altivec.c index 8ce1f1de25..c1246ead2b 100644 --- a/libavcodec/ppc/int_altivec.c +++ b/libavcodec/ppc/int_altivec.c @@ -23,7 +23,7 @@ ** integer misc ops. **/ -#include "../dsputil.h" +#include "dsputil.h" #include "gcc_fixes.h" diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index 0a789d16de..f564aa3c37 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -23,8 +23,8 @@ #include #include -#include "../dsputil.h" -#include "../mpegvideo.h" +#include "dsputil.h" +#include "mpegvideo.h" #include "gcc_fixes.h" diff --git a/libavcodec/ppc/mpegvideo_ppc.c b/libavcodec/ppc/mpegvideo_ppc.c index c5e822f772..1499814ff8 100644 --- a/libavcodec/ppc/mpegvideo_ppc.c +++ b/libavcodec/ppc/mpegvideo_ppc.c @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../dsputil.h" -#include "../mpegvideo.h" +#include "dsputil.h" +#include "mpegvideo.h" #include #ifdef HAVE_ALTIVEC diff --git a/libavcodec/ppc/snow_altivec.c b/libavcodec/ppc/snow_altivec.c index b15672ffe1..66ab86553a 100644 --- a/libavcodec/ppc/snow_altivec.c +++ b/libavcodec/ppc/snow_altivec.c @@ -21,11 +21,11 @@ * */ -#include "../dsputil.h" +#include "dsputil.h" #include "gcc_fixes.h" #include "dsputil_altivec.h" -#include "../snow.h" +#include "snow.h" #undef NDEBUG #include diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c index 114c9d41f3..dc6883cbe3 100644 --- a/libavcodec/ppc/vc1dsp_altivec.c +++ b/libavcodec/ppc/vc1dsp_altivec.c @@ -20,7 +20,7 @@ * */ -#include "../dsputil.h" +#include "dsputil.h" #include "gcc_fixes.h" diff --git a/libavcodec/ps2/dsputil_mmi.c b/libavcodec/ps2/dsputil_mmi.c index 0d72ae88c6..22ee5cea86 100644 --- a/libavcodec/ps2/dsputil_mmi.c +++ b/libavcodec/ps2/dsputil_mmi.c @@ -22,7 +22,7 @@ * clear_blocks_mmi() by BroadQ */ -#include "../dsputil.h" +#include "dsputil.h" #include "mmi.h" void ff_mmi_idct_put(uint8_t *dest, int line_size, DCTELEM *block); diff --git a/libavcodec/ps2/idct_mmi.c b/libavcodec/ps2/idct_mmi.c index dfe9b37268..6aaf8b355a 100644 --- a/libavcodec/ps2/idct_mmi.c +++ b/libavcodec/ps2/idct_mmi.c @@ -26,8 +26,8 @@ * */ -#include "../common.h" -#include "../dsputil.h" +#include "common.h" +#include "dsputil.h" #include "mmi.h" #define BITS_INV_ACC 5 // 4 or 5 for IEEE diff --git a/libavcodec/ps2/mpegvideo_mmi.c b/libavcodec/ps2/mpegvideo_mmi.c index c21fe7d143..dff8be7fd0 100644 --- a/libavcodec/ps2/mpegvideo_mmi.c +++ b/libavcodec/ps2/mpegvideo_mmi.c @@ -20,9 +20,9 @@ * MMI optimization by Leon van Stuivenberg */ -#include "../dsputil.h" -#include "../mpegvideo.h" -#include "../avcodec.h" +#include "dsputil.h" +#include "mpegvideo.h" +#include "avcodec.h" static void dct_unquantize_h263_mmi(MpegEncContext *s, DCTELEM *block, int n, int qscale) diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c index 7e7e3304b7..15b0350f2d 100644 --- a/libavcodec/sh4/dsputil_align.c +++ b/libavcodec/sh4/dsputil_align.c @@ -21,8 +21,8 @@ */ -#include "../avcodec.h" -#include "../dsputil.h" +#include "avcodec.h" +#include "dsputil.h" #define LP(p) *(uint32_t*)(p) diff --git a/libavcodec/sh4/dsputil_sh4.c b/libavcodec/sh4/dsputil_sh4.c index b38eb25516..18b19b1c3a 100644 --- 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 "../dsputil.h" +#include "avcodec.h" +#include "dsputil.h" static void memzero_align8(void *dst,size_t size) { diff --git a/libavcodec/sh4/idct_sh4.c b/libavcodec/sh4/idct_sh4.c index 3b8428c3cd..8259c0075d 100644 --- 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 "dsputil.h" #define c1 1.38703984532214752434 /* sqrt(2)*cos(1*pi/16) */ #define c2 1.30656296487637657577 /* sqrt(2)*cos(2*pi/16) */ #define c3 1.17587560241935884520 /* sqrt(2)*cos(3*pi/16) */ diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c index 5e59ce7765..74232ead16 100644 --- a/libavcodec/sparc/dsputil_vis.c +++ b/libavcodec/sparc/dsputil_vis.c @@ -31,7 +31,7 @@ #include #include -#include "../dsputil.h" +#include "dsputil.h" #include "vis.h" -- cgit v1.2.3