Revision b550bfaa

View differences:

libavcodec/Makefile
4 4
#
5 5
include ../config.mak
6 6

  
7
CFLAGS+=-I$(SRC_PATH)/libswscale
7
CFLAGS+=-I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec
8 8

  
9 9
OBJS= bitstream.o \
10 10
      utils.o \
libavcodec/alpha/dsputil_alpha.c
20 20
 */
21 21

  
22 22
#include "asm.h"
23
#include "../dsputil.h"
23
#include "dsputil.h"
24 24

  
25 25
extern void simple_idct_axp(DCTELEM *block);
26 26
extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block);
libavcodec/alpha/motion_est_alpha.c
20 20
 */
21 21

  
22 22
#include "asm.h"
23
#include "../dsputil.h"
23
#include "dsputil.h"
24 24

  
25 25
void get_pixels_mvi(DCTELEM *restrict block,
26 26
                    const uint8_t *restrict pixels, int line_size)
libavcodec/alpha/mpegvideo_alpha.c
20 20
 */
21 21

  
22 22
#include "asm.h"
23
#include "../dsputil.h"
24
#include "../mpegvideo.h"
23
#include "dsputil.h"
24
#include "mpegvideo.h"
25 25

  
26 26
static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block,
27 27
                                    int n, int qscale)
libavcodec/alpha/simple_idct_alpha.c
27 27
 */
28 28

  
29 29
#include "asm.h"
30
#include "../dsputil.h"
30
#include "dsputil.h"
31 31

  
32 32
extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
33 33
                                        int line_size);
libavcodec/armv4l/dsputil_arm.c
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#include "../dsputil.h"
22
#include "dsputil.h"
23 23
#ifdef HAVE_IPP
24 24
#include "ipp.h"
25 25
#endif
libavcodec/armv4l/dsputil_iwmmxt.c
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#include "../dsputil.h"
22
#include "dsputil.h"
23 23

  
24 24
#define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt
25 25
#define SET_RND(regd)  __asm__ __volatile__ ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12");
libavcodec/armv4l/mpegvideo_arm.c
19 19
 *
20 20
 */
21 21

  
22
#include "../dsputil.h"
23
#include "../mpegvideo.h"
24
#include "../avcodec.h"
22
#include "dsputil.h"
23
#include "mpegvideo.h"
24
#include "avcodec.h"
25 25

  
26 26
extern void MPV_common_init_iwmmxt(MpegEncContext *s);
27 27
extern void MPV_common_init_armv5te(MpegEncContext *s);
libavcodec/armv4l/mpegvideo_armv5te.c
25 25
 * Instructions timings and optimization guide for ARM9E: http://www.arm.com/pdfs/DDI0222B_9EJS_r1p2.pdf
26 26
 */
27 27

  
28
#include "../dsputil.h"
29
#include "../mpegvideo.h"
30
#include "../avcodec.h"
28
#include "dsputil.h"
29
#include "mpegvideo.h"
30
#include "avcodec.h"
31 31

  
32 32

  
33 33
#ifdef ENABLE_ARM_TESTS
libavcodec/armv4l/mpegvideo_iwmmxt.c
18 18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 19
 */
20 20

  
21
#include "../dsputil.h"
22
#include "../mpegvideo.h"
23
#include "../avcodec.h"
21
#include "dsputil.h"
22
#include "mpegvideo.h"
23
#include "avcodec.h"
24 24

  
25 25
static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s,
26 26
                                             DCTELEM *block, int n, int qscale)
libavcodec/bfin/dsputil_bfin.c
23 23

  
24 24
#include <unistd.h>
25 25
#include <bits/bfin_sram.h>
26
#include "../avcodec.h"
27
#include "../dsputil.h"
26
#include "avcodec.h"
27
#include "dsputil.h"
28 28

  
29 29
#define USE_L1CODE
30 30

  
libavcodec/i386/cavsdsp_mmx.c
22 22
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
23 23
 */
24 24

  
25
#include "../dsputil.h"
25
#include "dsputil.h"
26 26
#include "common.h"
27 27

  
28 28
DECLARE_ALIGNED_8(static const uint64_t,ff_pw_4 ) = 0x0004000400040004ULL;
libavcodec/i386/cputest.c
21 21
 */
22 22

  
23 23
#include <stdlib.h>
24
#include "../dsputil.h"
24
#include "dsputil.h"
25 25

  
26 26
#undef printf
27 27

  
libavcodec/i386/dsputil_mmx.c
22 22
 * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
23 23
 */
24 24

  
25
#include "../dsputil.h"
26
#include "../simple_idct.h"
27
#include "../mpegvideo.h"
25
#include "dsputil.h"
26
#include "simple_idct.h"
27
#include "mpegvideo.h"
28 28
#include "x86_cpu.h"
29 29
#include "mmx.h"
30 30

  
libavcodec/i386/fdct_mmx.c
30 30
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
31 31
 */
32 32
#include "common.h"
33
#include "../dsputil.h"
33
#include "dsputil.h"
34 34
#include "mmx.h"
35 35

  
36 36
#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))
libavcodec/i386/fft_3dn.c
19 19
 * License along with FFmpeg; if not, write to the Free Software
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22
#include "../dsputil.h"
22
#include "dsputil.h"
23 23

  
24 24
static const int p1m1[2] __attribute__((aligned(8))) =
25 25
    { 0, 1 << 31 };
libavcodec/i386/fft_3dn2.c
19 19
 * License along with FFmpeg; if not, write to the Free Software
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22
#include "../dsputil.h"
22
#include "dsputil.h"
23 23

  
24 24
static const int p1m1[2] __attribute__((aligned(8))) =
25 25
    { 0, 1 << 31 };
libavcodec/i386/fft_sse.c
18 18
 * License along with FFmpeg; if not, write to the Free Software
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21
#include "../dsputil.h"
21
#include "dsputil.h"
22 22

  
23 23
static const int p1p1p1m1[4] __attribute__((aligned(16))) =
24 24
    { 0, 0, 0, 1 << 31 };
libavcodec/i386/idct_mmx.c
20 20
 */
21 21

  
22 22
#include "common.h"
23
#include "../dsputil.h"
23
#include "dsputil.h"
24 24

  
25 25
#include "mmx.h"
26 26

  
libavcodec/i386/idct_mmx_xvid.c
50 50

  
51 51

  
52 52
#include <inttypes.h>
53
#include "../avcodec.h"
53
#include "avcodec.h"
54 54

  
55 55
//=============================================================================
56 56
// Macros and other preprocessor constants
libavcodec/i386/motion_est_mmx.c
21 21
 *
22 22
 * mostly by Michael Niedermayer <michaelni@gmx.at>
23 23
 */
24
#include "../dsputil.h"
24
#include "dsputil.h"
25 25
#include "x86_cpu.h"
26 26

  
27 27
static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={
libavcodec/i386/mpegvideo_mmx.c
22 22
 * h263, mpeg1, mpeg2 dequantizer & draw_edges by Michael Niedermayer <michaelni@gmx.at>
23 23
 */
24 24

  
25
#include "../dsputil.h"
26
#include "../mpegvideo.h"
27
#include "../avcodec.h"
25
#include "dsputil.h"
26
#include "mpegvideo.h"
27
#include "avcodec.h"
28 28
#include "x86_cpu.h"
29 29

  
30 30
extern uint16_t inv_zigzag_direct16[64];
libavcodec/i386/simple_idct_mmx.c
19 19
 * License along with FFmpeg; if not, write to the Free Software
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22
#include "../dsputil.h"
23
#include "../simple_idct.h"
22
#include "dsputil.h"
23
#include "simple_idct.h"
24 24

  
25 25
/*
26 26
23170.475006
libavcodec/i386/snowdsp_mmx.c
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#include "../avcodec.h"
23
#include "../snow.h"
22
#include "avcodec.h"
23
#include "snow.h"
24 24
#include "x86_cpu.h"
25 25

  
26 26
void ff_snow_horizontal_compose97i_sse2(DWTELEM *b, int width){
libavcodec/i386/vp3dsp_mmx.c
23 23
 * MMX-optimized functions cribbed from the original VP3 source code.
24 24
 */
25 25

  
26
#include "../dsputil.h"
26
#include "dsputil.h"
27 27
#include "mmx.h"
28 28

  
29 29
#define IdctAdjustBeforeShift 8
libavcodec/i386/vp3dsp_sse2.c
23 23
 * SSE2-optimized functions cribbed from the original VP3 source code.
24 24
 */
25 25

  
26
#include "../dsputil.h"
26
#include "dsputil.h"
27 27
#include "mmx.h"
28 28

  
29 29
static DECLARE_ALIGNED_16(const unsigned short, SSE2_dequant_const[]) =
libavcodec/mlib/dsputil_mlib.c
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#include "../dsputil.h"
23
#include "../mpegvideo.h"
22
#include "dsputil.h"
23
#include "mpegvideo.h"
24 24

  
25 25
#include <mlib_types.h>
26 26
#include <mlib_status.h>
libavcodec/ppc/dsputil_altivec.c
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22 22

  
23
#include "../dsputil.h"
23
#include "dsputil.h"
24 24

  
25 25
#include "gcc_fixes.h"
26 26

  
libavcodec/ppc/dsputil_ppc.c
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22 22

  
23
#include "../dsputil.h"
23
#include "dsputil.h"
24 24

  
25 25
#include "dsputil_ppc.h"
26 26

  
libavcodec/ppc/fdct_altivec.c
21 21

  
22 22

  
23 23
#include "common.h"
24
#include "../dsputil.h"
24
#include "dsputil.h"
25 25
#include "dsputil_altivec.h"
26 26
#include "gcc_fixes.h"
27 27

  
libavcodec/ppc/fft_altivec.c
20 20
 * License along with FFmpeg; if not, write to the Free Software
21 21
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 22
 */
23
#include "../dsputil.h"
23
#include "dsputil.h"
24 24

  
25 25
#include "gcc_fixes.h"
26 26

  
libavcodec/ppc/float_altivec.c
18 18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 19
 */
20 20

  
21
#include "../dsputil.h"
21
#include "dsputil.h"
22 22

  
23 23
#include "gcc_fixes.h"
24 24

  
libavcodec/ppc/gmc_altivec.c
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22 22

  
23
#include "../dsputil.h"
23
#include "dsputil.h"
24 24

  
25 25
#include "gcc_fixes.h"
26 26

  
libavcodec/ppc/h264_altivec.c
18 18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 19
 */
20 20

  
21
#include "../dsputil.h"
21
#include "dsputil.h"
22 22

  
23 23
#include "gcc_fixes.h"
24 24

  
libavcodec/ppc/idct_altivec.c
39 39

  
40 40
#include <stdlib.h>                                      /* malloc(), free() */
41 41
#include <string.h>
42
#include "../dsputil.h"
42
#include "dsputil.h"
43 43

  
44 44
#include "gcc_fixes.h"
45 45

  
libavcodec/ppc/int_altivec.c
23 23
 ** integer misc ops.
24 24
 **/
25 25

  
26
#include "../dsputil.h"
26
#include "dsputil.h"
27 27

  
28 28
#include "gcc_fixes.h"
29 29

  
libavcodec/ppc/mpegvideo_altivec.c
23 23

  
24 24
#include <stdlib.h>
25 25
#include <stdio.h>
26
#include "../dsputil.h"
27
#include "../mpegvideo.h"
26
#include "dsputil.h"
27
#include "mpegvideo.h"
28 28

  
29 29
#include "gcc_fixes.h"
30 30

  
libavcodec/ppc/mpegvideo_ppc.c
18 18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 19
 */
20 20

  
21
#include "../dsputil.h"
22
#include "../mpegvideo.h"
21
#include "dsputil.h"
22
#include "mpegvideo.h"
23 23
#include <time.h>
24 24

  
25 25
#ifdef HAVE_ALTIVEC
libavcodec/ppc/snow_altivec.c
21 21
 *
22 22
 */
23 23

  
24
#include "../dsputil.h"
24
#include "dsputil.h"
25 25

  
26 26
#include "gcc_fixes.h"
27 27
#include "dsputil_altivec.h"
28
#include "../snow.h"
28
#include "snow.h"
29 29

  
30 30
#undef NDEBUG
31 31
#include <assert.h>
libavcodec/ppc/vc1dsp_altivec.c
20 20
 *
21 21
 */
22 22

  
23
#include "../dsputil.h"
23
#include "dsputil.h"
24 24

  
25 25
#include "gcc_fixes.h"
26 26

  
libavcodec/ps2/dsputil_mmi.c
22 22
 * clear_blocks_mmi() by BroadQ
23 23
 */
24 24

  
25
#include "../dsputil.h"
25
#include "dsputil.h"
26 26
#include "mmi.h"
27 27

  
28 28
void ff_mmi_idct_put(uint8_t *dest, int line_size, DCTELEM *block);
libavcodec/ps2/idct_mmi.c
26 26
 *
27 27
*/
28 28

  
29
#include "../common.h"
30
#include "../dsputil.h"
29
#include "common.h"
30
#include "dsputil.h"
31 31
#include "mmi.h"
32 32

  
33 33
#define BITS_INV_ACC    5       // 4 or 5 for IEEE
libavcodec/ps2/mpegvideo_mmi.c
20 20
 * MMI optimization by Leon van Stuivenberg
21 21
 */
22 22

  
23
#include "../dsputil.h"
24
#include "../mpegvideo.h"
25
#include "../avcodec.h"
23
#include "dsputil.h"
24
#include "mpegvideo.h"
25
#include "avcodec.h"
26 26

  
27 27
static void dct_unquantize_h263_mmi(MpegEncContext *s,
28 28
                                  DCTELEM *block, int n, int qscale)
libavcodec/sh4/dsputil_align.c
21 21
 */
22 22

  
23 23

  
24
#include "../avcodec.h"
25
#include "../dsputil.h"
24
#include "avcodec.h"
25
#include "dsputil.h"
26 26

  
27 27

  
28 28
#define         LP(p)           *(uint32_t*)(p)
libavcodec/sh4/dsputil_sh4.c
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22 22

  
23
#include "../avcodec.h"
24
#include "../dsputil.h"
23
#include "avcodec.h"
24
#include "dsputil.h"
25 25

  
26 26
static void memzero_align8(void *dst,size_t size)
27 27
{
libavcodec/sh4/idct_sh4.c
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22 22

  
23
#include "../dsputil.h"
23
#include "dsputil.h"
24 24
#define c1      1.38703984532214752434  /* sqrt(2)*cos(1*pi/16) */
25 25
#define c2      1.30656296487637657577  /* sqrt(2)*cos(2*pi/16) */
26 26
#define c3      1.17587560241935884520  /* sqrt(2)*cos(3*pi/16) */
libavcodec/sparc/dsputil_vis.c
31 31
#include <signal.h>
32 32
#include <setjmp.h>
33 33

  
34
#include "../dsputil.h"
34
#include "dsputil.h"
35 35

  
36 36
#include "vis.h"
37 37

  

Also available in: Unified diff