Commit b550bfaa authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Diego Biurrun

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
parent 14b2d010
......@@ -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 \
......
......@@ -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);
......
......@@ -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)
......
......@@ -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)
......
......@@ -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);
......
......@@ -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
......
......@@ -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");
......
......@@ -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);
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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;
......
......@@ -21,7 +21,7 @@
*/
#include <stdlib.h>
#include "../dsputil.h"
#include "dsputil.h"
#undef printf
......
......@@ -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"
......
......@@ -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)))
......
......@@ -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 };
......
......@@ -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 };
......
......@@ -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 };
......
......@@ -20,7 +20,7 @@
*/
#include "common.h"
#include "../dsputil.h"
#include "dsputil.h"
#include "mmx.h"
......
......@@ -50,7 +50,7 @@
#include <inttypes.h>
#include "../avcodec.h"
#include "avcodec.h"
//=============================================================================
// Macros and other preprocessor constants
......
......@@ -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]={
......
......@@ -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];
......
......@@ -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
......
......@@ -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){
......
......@@ -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
......
......@@ -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[]) =
......
......@@ -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>
......
......@@ -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"
......
......@@ -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"
......
......@@ -21,7 +21,7 @@
#include "common.h"
#include "../dsputil.h"
#include "dsputil.h"
#include "dsputil_altivec.h"
#include "gcc_fixes.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -39,7 +39,7 @@
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
#include "../dsputil.h"
#include "dsputil.h"
#include "gcc_fixes.h"
......
......@@ -23,7 +23,7 @@
** integer misc ops.
**/
#include "../dsputil.h"
#include "dsputil.h"
#include "gcc_fixes.h"
......
......@@ -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"
......
......@@ -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
......
......@@ -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>
......
......@@ -20,7 +20,7 @@
*
*/
#include "../dsputil.h"
#include "dsputil.h"
#include "gcc_fixes.h"
......
......@@ -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);
......
......@@ -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
......
......@@ -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)
......
......@@ -21,8 +21,8 @@
*/
#include "../avcodec.h"
#include "../dsputil.h"
#include "avcodec.h"
#include "dsputil.h"
#define LP(p) *(uint32_t*)(p)
......
......@@ -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)
{
......
......@@ -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) */
......
......@@ -31,7 +31,7 @@
#include <signal.h>
#include <setjmp.h>
#include "../dsputil.h"
#include "dsputil.h"
#include "vis.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment