From b550bfaa618da17c63c0ef132f938beaaaf0a3dc Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Wed, 16 May 2007 09:51:45 +0000
Subject: [PATCH] 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(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index f096a747035..32c85ecf9ea 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 c98d6f7ff8c..36357356ed9 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 337ffb38e27..b23338c09a3 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 8ad264b06f5..9aa20f420bf 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 adadd3ab0ce..7c4a0d578e2 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 61b5fdacc45..ac4dab211a8 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 7b28db5bb5d..62dcfab0c11 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 22d40d8bcfe..3371ed7ce58 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 5e83c8a4389..9f9f6ed4732 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 1336ac5f8d0..9e112139139 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 2aebc2016e4..312c06c3a8f 100644
--- a/libavcodec/bfin/dsputil_bfin.c
+++ b/libavcodec/bfin/dsputil_bfin.c
@@ -23,8 +23,8 @@
#include <unistd.h>
#include <bits/bfin_sram.h>
-#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 51d519a5ca7..30bab38c025 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 0705ab3e548..fe751fb5b84 100644
--- a/libavcodec/i386/cputest.c
+++ b/libavcodec/i386/cputest.c
@@ -21,7 +21,7 @@
*/
#include <stdlib.h>
-#include "../dsputil.h"
+#include "dsputil.h"
#undef printf
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index 9b81b2d6107..063d0237b07 100644
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -22,9 +22,9 @@
* MMX optimization by Nick Kurshev <nickols_k@mail.ru>
*/
-#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 69e75b23cf1..a034c9f9493 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 8087f1932cb..4231d855afd 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 a4fe5f0b68f..6d063321d7b 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 a5ae9c8c4af..966b8a93f58 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 4c548fdcee5..b3a5267f427 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 65ece6de9c8..1e7ea3e7fae 100644
--- a/libavcodec/i386/idct_mmx_xvid.c
+++ b/libavcodec/i386/idct_mmx_xvid.c
@@ -50,7 +50,7 @@
#include <inttypes.h>
-#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 e280b34d70c..e43cacdcc2f 100644
--- a/libavcodec/i386/motion_est_mmx.c
+++ b/libavcodec/i386/motion_est_mmx.c
@@ -21,7 +21,7 @@
*
* mostly by Michael Niedermayer <michaelni@gmx.at>
*/
-#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 f8bdcc6e503..d5316877bef 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 <michaelni@gmx.at>
*/
-#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 525ef34f7cf..dd22ee8aa32 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 8f182303d54..1d5a4f4ff74 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 f715dc803d0..363ea02e3b4 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 bd2911d599b..8da2e686532 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 b78a54e0e57..1b1b5345a80 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 <mlib_types.h>
#include <mlib_status.h>
diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c
index bbc53d76196..78d736171f5 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 4d5e28996bd..ae08368f420 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 2418c32bb6c..cb9446d391e 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 384a774ff1e..62de81f5d81 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 22c2de61a7f..750e6d7f902 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 42c936bb331..4b74284471b 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 bac620e82aa..963c6083ae0 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 66c8082f76c..c4e0cfd0a28 100644
--- a/libavcodec/ppc/idct_altivec.c
+++ b/libavcodec/ppc/idct_altivec.c
@@ -39,7 +39,7 @@
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
-#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 8ce1f1de254..c1246ead2bb 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 0a789d16de8..f564aa3c37f 100644
--- 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 "../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 c5e822f772f..1499814ff8b 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 <time.h>
#ifdef HAVE_ALTIVEC
diff --git a/libavcodec/ppc/snow_altivec.c b/libavcodec/ppc/snow_altivec.c
index b15672ffe12..66ab86553ac 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 <assert.h>
diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c
index 114c9d41f3b..dc6883cbe38 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 0d72ae88c6e..22ee5cea86a 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 dfe9b372688..6aaf8b355ac 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 c21fe7d1434..dff8be7fd00 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 7e7e3304b72..15b0350f2d2 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 b38eb255164..18b19b1c3ae 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 3b8428c3cd8..8259c0075de 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 5e59ce77657..74232ead167 100644
--- a/libavcodec/sparc/dsputil_vis.c
+++ b/libavcodec/sparc/dsputil_vis.c
@@ -31,7 +31,7 @@
#include <signal.h>
#include <setjmp.h>
-#include "../dsputil.h"
+#include "dsputil.h"
#include "vis.h"
--
GitLab