summaryrefslogtreecommitdiff
path: root/libavcodec/i386
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/i386')
-rw-r--r--libavcodec/i386/cavsdsp_mmx.c2
-rw-r--r--libavcodec/i386/cputest.c2
-rw-r--r--libavcodec/i386/dsputil_mmx.c6
-rw-r--r--libavcodec/i386/fdct_mmx.c2
-rw-r--r--libavcodec/i386/fft_3dn.c2
-rw-r--r--libavcodec/i386/fft_3dn2.c2
-rw-r--r--libavcodec/i386/fft_sse.c2
-rw-r--r--libavcodec/i386/idct_mmx.c2
-rw-r--r--libavcodec/i386/idct_mmx_xvid.c2
-rw-r--r--libavcodec/i386/motion_est_mmx.c2
-rw-r--r--libavcodec/i386/mpegvideo_mmx.c6
-rw-r--r--libavcodec/i386/simple_idct_mmx.c4
-rw-r--r--libavcodec/i386/snowdsp_mmx.c4
-rw-r--r--libavcodec/i386/vp3dsp_mmx.c2
-rw-r--r--libavcodec/i386/vp3dsp_sse2.c2
15 files changed, 21 insertions, 21 deletions
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 <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 9b81b2d610..063d0237b0 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 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 <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 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 <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 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 <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 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[]) =