RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ronald S. Bultje 2007-05-16 09:51:45 +00:00 committed by Diego Biurrun
parent 14b2d01058
commit b550bfaa61
47 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@ -4,7 +4,7 @@
# #
include ../config.mak include ../config.mak
CFLAGS+=-I$(SRC_PATH)/libswscale CFLAGS+=-I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec
OBJS= bitstream.o \ OBJS= bitstream.o \
utils.o \ utils.o \

2
libavcodec/alpha/dsputil_alpha.c
View File

@ -20,7 +20,7 @@
*/ */
#include "asm.h" #include "asm.h"
#include "../dsputil.h" #include "dsputil.h"
extern void simple_idct_axp(DCTELEM *block); extern void simple_idct_axp(DCTELEM *block);
extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block); extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block);

2
libavcodec/alpha/motion_est_alpha.c
View File

@ -20,7 +20,7 @@
*/ */
#include "asm.h" #include "asm.h"
#include "../dsputil.h" #include "dsputil.h"
void get_pixels_mvi(DCTELEM *restrict block, void get_pixels_mvi(DCTELEM *restrict block,
const uint8_t *restrict pixels, int line_size) const uint8_t *restrict pixels, int line_size)

4
libavcodec/alpha/mpegvideo_alpha.c
View File

@ -20,8 +20,8 @@
*/ */
#include "asm.h" #include "asm.h"
#include "../dsputil.h" #include "dsputil.h"
#include "../mpegvideo.h" #include "mpegvideo.h"
static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block, static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block,
int n, int qscale) int n, int qscale)

2
libavcodec/alpha/simple_idct_alpha.c
View File

@ -27,7 +27,7 @@
*/ */
#include "asm.h" #include "asm.h"
#include "../dsputil.h" #include "dsputil.h"
extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels, extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
int line_size); int line_size);

2
libavcodec/armv4l/dsputil_arm.c
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#ifdef HAVE_IPP #ifdef HAVE_IPP
#include "ipp.h" #include "ipp.h"
#endif #endif

2
libavcodec/armv4l/dsputil_iwmmxt.c
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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 DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt
#define SET_RND(regd) __asm__ __volatile__ ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12"); #define SET_RND(regd) __asm__ __volatile__ ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12");

6
libavcodec/armv4l/mpegvideo_arm.c
View File

@ -19,9 +19,9 @@
* *
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "../mpegvideo.h" #include "mpegvideo.h"
#include "../avcodec.h" #include "avcodec.h"
extern void MPV_common_init_iwmmxt(MpegEncContext *s); extern void MPV_common_init_iwmmxt(MpegEncContext *s);
extern void MPV_common_init_armv5te(MpegEncContext *s); extern void MPV_common_init_armv5te(MpegEncContext *s);

6
libavcodec/armv4l/mpegvideo_armv5te.c
View File

@ -25,9 +25,9 @@
* Instructions timings and optimization guide for ARM9E: http://www.arm.com/pdfs/DDI0222B_9EJS_r1p2.pdf * Instructions timings and optimization guide for ARM9E: http://www.arm.com/pdfs/DDI0222B_9EJS_r1p2.pdf
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "../mpegvideo.h" #include "mpegvideo.h"
#include "../avcodec.h" #include "avcodec.h"
#ifdef ENABLE_ARM_TESTS #ifdef ENABLE_ARM_TESTS

6
libavcodec/armv4l/mpegvideo_iwmmxt.c
View File

@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "../mpegvideo.h" #include "mpegvideo.h"
#include "../avcodec.h" #include "avcodec.h"
static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s, static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s,
DCTELEM *block, int n, int qscale) DCTELEM *block, int n, int qscale)

4
libavcodec/bfin/dsputil_bfin.c
View File

@ -23,8 +23,8 @@
#include <unistd.h> #include <unistd.h>
#include <bits/bfin_sram.h> #include <bits/bfin_sram.h>
#include "../avcodec.h" #include "avcodec.h"
#include "../dsputil.h" #include "dsputil.h"
#define USE_L1CODE #define USE_L1CODE

2
libavcodec/i386/cavsdsp_mmx.c
View File

@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "common.h" #include "common.h"
DECLARE_ALIGNED_8(static const uint64_t,ff_pw_4 ) = 0x0004000400040004ULL; DECLARE_ALIGNED_8(static const uint64_t,ff_pw_4 ) = 0x0004000400040004ULL;

2
libavcodec/i386/cputest.c
View File

@ -21,7 +21,7 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include "../dsputil.h" #include "dsputil.h"
#undef printf #undef printf

6
libavcodec/i386/dsputil_mmx.c
View File

@ -22,9 +22,9 @@
* MMX optimization by Nick Kurshev <nickols_k@mail.ru> * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "../simple_idct.h" #include "simple_idct.h"
#include "../mpegvideo.h" #include "mpegvideo.h"
#include "x86_cpu.h" #include "x86_cpu.h"
#include "mmx.h" #include "mmx.h"

2
libavcodec/i386/fdct_mmx.c
View File

@ -30,7 +30,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "common.h" #include "common.h"
#include "../dsputil.h" #include "dsputil.h"
#include "mmx.h" #include "mmx.h"
#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align))) #define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))

2
libavcodec/i386/fft_3dn.c
View File

@ -19,7 +19,7 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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))) = static const int p1m1[2] __attribute__((aligned(8))) =
{ 0, 1 << 31 }; { 0, 1 << 31 };

2
libavcodec/i386/fft_3dn2.c
View File

@ -19,7 +19,7 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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))) = static const int p1m1[2] __attribute__((aligned(8))) =
{ 0, 1 << 31 }; { 0, 1 << 31 };

2
libavcodec/i386/fft_sse.c
View File

@ -18,7 +18,7 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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))) = static const int p1p1p1m1[4] __attribute__((aligned(16))) =
{ 0, 0, 0, 1 << 31 }; { 0, 0, 0, 1 << 31 };

2
libavcodec/i386/idct_mmx.c
View File

@ -20,7 +20,7 @@
*/ */
#include "common.h" #include "common.h"
#include "../dsputil.h" #include "dsputil.h"
#include "mmx.h" #include "mmx.h"

2
libavcodec/i386/idct_mmx_xvid.c
View File

@ -50,7 +50,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "../avcodec.h" #include "avcodec.h"
//============================================================================= //=============================================================================
// Macros and other preprocessor constants // Macros and other preprocessor constants

2
libavcodec/i386/motion_est_mmx.c
View File

@ -21,7 +21,7 @@
* *
* mostly by Michael Niedermayer <michaelni@gmx.at> * mostly by Michael Niedermayer <michaelni@gmx.at>
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "x86_cpu.h" #include "x86_cpu.h"
static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={ static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={

6
libavcodec/i386/mpegvideo_mmx.c
View File

@ -22,9 +22,9 @@
* h263, mpeg1, mpeg2 dequantizer & draw_edges by Michael Niedermayer <michaelni@gmx.at> * h263, mpeg1, mpeg2 dequantizer & draw_edges by Michael Niedermayer <michaelni@gmx.at>
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "../mpegvideo.h" #include "mpegvideo.h"
#include "../avcodec.h" #include "avcodec.h"
#include "x86_cpu.h" #include "x86_cpu.h"
extern uint16_t inv_zigzag_direct16[64]; extern uint16_t inv_zigzag_direct16[64];

4
libavcodec/i386/simple_idct_mmx.c
View File

@ -19,8 +19,8 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "../simple_idct.h" #include "simple_idct.h"
/* /*
23170.475006 23170.475006

4
libavcodec/i386/snowdsp_mmx.c
View File

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../avcodec.h" #include "avcodec.h"
#include "../snow.h" #include "snow.h"
#include "x86_cpu.h" #include "x86_cpu.h"
void ff_snow_horizontal_compose97i_sse2(DWTELEM *b, int width){ void ff_snow_horizontal_compose97i_sse2(DWTELEM *b, int width){

2
libavcodec/i386/vp3dsp_mmx.c
View File

@ -23,7 +23,7 @@
* MMX-optimized functions cribbed from the original VP3 source code. * MMX-optimized functions cribbed from the original VP3 source code.
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "mmx.h" #include "mmx.h"
#define IdctAdjustBeforeShift 8 #define IdctAdjustBeforeShift 8

2
libavcodec/i386/vp3dsp_sse2.c
View File

@ -23,7 +23,7 @@
* SSE2-optimized functions cribbed from the original VP3 source code. * SSE2-optimized functions cribbed from the original VP3 source code.
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "mmx.h" #include "mmx.h"
static DECLARE_ALIGNED_16(const unsigned short, SSE2_dequant_const[]) = static DECLARE_ALIGNED_16(const unsigned short, SSE2_dequant_const[]) =

4
libavcodec/mlib/dsputil_mlib.c
View File

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "../mpegvideo.h" #include "mpegvideo.h"
#include <mlib_types.h> #include <mlib_types.h>
#include <mlib_status.h> #include <mlib_status.h>

2
libavcodec/ppc/dsputil_altivec.c
View File

@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "gcc_fixes.h" #include "gcc_fixes.h"

2
libavcodec/ppc/dsputil_ppc.c
View File

@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "dsputil_ppc.h" #include "dsputil_ppc.h"

2
libavcodec/ppc/fdct_altivec.c
View File

@ -21,7 +21,7 @@
#include "common.h" #include "common.h"
#include "../dsputil.h" #include "dsputil.h"
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
#include "gcc_fixes.h" #include "gcc_fixes.h"

2
libavcodec/ppc/fft_altivec.c
View File

@ -20,7 +20,7 @@
* License along with FFmpeg; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "gcc_fixes.h" #include "gcc_fixes.h"

2
libavcodec/ppc/float_altivec.c
View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "gcc_fixes.h" #include "gcc_fixes.h"

2
libavcodec/ppc/gmc_altivec.c
View File

@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "gcc_fixes.h" #include "gcc_fixes.h"

2
libavcodec/ppc/h264_altivec.c
View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "gcc_fixes.h" #include "gcc_fixes.h"

2
libavcodec/ppc/idct_altivec.c
View File

@ -39,7 +39,7 @@
#include <stdlib.h> /* malloc(), free() */ #include <stdlib.h> /* malloc(), free() */
#include <string.h> #include <string.h>
#include "../dsputil.h" #include "dsputil.h"
#include "gcc_fixes.h" #include "gcc_fixes.h"

2
libavcodec/ppc/int_altivec.c
View File

@ -23,7 +23,7 @@
** integer misc ops. ** integer misc ops.
**/ **/
#include "../dsputil.h" #include "dsputil.h"
#include "gcc_fixes.h" #include "gcc_fixes.h"

4
libavcodec/ppc/mpegvideo_altivec.c
View File

@ -23,8 +23,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "../dsputil.h" #include "dsputil.h"
#include "../mpegvideo.h" #include "mpegvideo.h"
#include "gcc_fixes.h" #include "gcc_fixes.h"

4
libavcodec/ppc/mpegvideo_ppc.c
View File

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "../mpegvideo.h" #include "mpegvideo.h"
#include <time.h> #include <time.h>
#ifdef HAVE_ALTIVEC #ifdef HAVE_ALTIVEC

4
libavcodec/ppc/snow_altivec.c
View File

@ -21,11 +21,11 @@
* *
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "gcc_fixes.h" #include "gcc_fixes.h"
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
#include "../snow.h" #include "snow.h"
#undef NDEBUG #undef NDEBUG
#include <assert.h> #include <assert.h>

2
libavcodec/ppc/vc1dsp_altivec.c
View File

@ -20,7 +20,7 @@
* *
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "gcc_fixes.h" #include "gcc_fixes.h"

2
libavcodec/ps2/dsputil_mmi.c
View File

@ -22,7 +22,7 @@
* clear_blocks_mmi() by BroadQ * clear_blocks_mmi() by BroadQ
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "mmi.h" #include "mmi.h"
void ff_mmi_idct_put(uint8_t *dest, int line_size, DCTELEM *block); void ff_mmi_idct_put(uint8_t *dest, int line_size, DCTELEM *block);

4
libavcodec/ps2/idct_mmi.c
View File

@ -26,8 +26,8 @@
* *
*/ */
#include "../common.h" #include "common.h"
#include "../dsputil.h" #include "dsputil.h"
#include "mmi.h" #include "mmi.h"
#define BITS_INV_ACC 5 // 4 or 5 for IEEE #define BITS_INV_ACC 5 // 4 or 5 for IEEE

6
libavcodec/ps2/mpegvideo_mmi.c
View File

@ -20,9 +20,9 @@
* MMI optimization by Leon van Stuivenberg * MMI optimization by Leon van Stuivenberg
*/ */
#include "../dsputil.h" #include "dsputil.h"
#include "../mpegvideo.h" #include "mpegvideo.h"
#include "../avcodec.h" #include "avcodec.h"
static void dct_unquantize_h263_mmi(MpegEncContext *s, static void dct_unquantize_h263_mmi(MpegEncContext *s,
DCTELEM *block, int n, int qscale) DCTELEM *block, int n, int qscale)

4
libavcodec/sh4/dsputil_align.c
View File

@ -21,8 +21,8 @@
*/ */
#include "../avcodec.h" #include "avcodec.h"
#include "../dsputil.h" #include "dsputil.h"
#define LP(p) *(uint32_t*)(p) #define LP(p) *(uint32_t*)(p)

4
libavcodec/sh4/dsputil_sh4.c
View File

@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../avcodec.h" #include "avcodec.h"
#include "../dsputil.h" #include "dsputil.h"
static void memzero_align8(void *dst,size_t size) static void memzero_align8(void *dst,size_t size)
{ {

2
libavcodec/sh4/idct_sh4.c
View File

@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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 c1 1.38703984532214752434 /* sqrt(2)*cos(1*pi/16) */
#define c2 1.30656296487637657577 /* sqrt(2)*cos(2*pi/16) */ #define c2 1.30656296487637657577 /* sqrt(2)*cos(2*pi/16) */
#define c3 1.17587560241935884520 /* sqrt(2)*cos(3*pi/16) */ #define c3 1.17587560241935884520 /* sqrt(2)*cos(3*pi/16) */

2
libavcodec/sparc/dsputil_vis.c
View File

@ -31,7 +31,7 @@
#include <signal.h> #include <signal.h>
#include <setjmp.h> #include <setjmp.h>
#include "../dsputil.h" #include "dsputil.h"
#include "vis.h" #include "vis.h"