Commit 245976da authored by Diego Biurrun's avatar Diego Biurrun

Use full path for #includes from another directory.

Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 86b2d47f
......@@ -25,14 +25,14 @@
#include <math.h>
#include "config.h"
#include "avformat.h"
#include "avfilter.h"
#include "avdevice.h"
#include "libavformat/avformat.h"
#include "libavfilter/avfilter.h"
#include "libavdevice/avdevice.h"
#include "libavutil/avstring.h"
#include "cmdutils.h"
#include "avstring.h"
#include "version.h"
#ifdef CONFIG_NETWORK
#include "network.h"
#include "libavformat/network.h"
#endif
#undef exit
......
......@@ -27,14 +27,14 @@
#include <errno.h>
#include <signal.h>
#include <limits.h>
#include "avformat.h"
#include "avdevice.h"
#include "swscale.h"
#include "framehook.h"
#include "opt.h"
#include "fifo.h"
#include "avstring.h"
#include "os_support.h"
#include "libavformat/avformat.h"
#include "libavdevice/avdevice.h"
#include "libswscale/swscale.h"
#include "libavformat/framehook.h"
#include "libavcodec/opt.h"
#include "libavutil/fifo.h"
#include "libavutil/avstring.h"
#include "libavformat/os_support.h"
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
......
......@@ -21,11 +21,11 @@
#include <math.h>
#include <limits.h>
#include "avformat.h"
#include "avdevice.h"
#include "rtsp.h"
#include "swscale.h"
#include "avstring.h"
#include "libavutil/avstring.h"
#include "libavformat/avformat.h"
#include "libavformat/rtsp.h"
#include "libavdevice/avdevice.h"
#include "libswscale/swscale.h"
#include "version.h"
#include "cmdutils.h"
......
......@@ -25,10 +25,13 @@
#endif
#include <string.h>
#include <stdlib.h>
#include "avformat.h"
#include "rtsp.h"
#include "rtp.h"
#include "os_support.h"
#include "libavutil/random.h"
#include "libavutil/avstring.h"
#include "libavformat/avformat.h"
#include "libavformat/network.h"
#include "libavformat/os_support.h"
#include "libavformat/rtp.h"
#include "libavformat/rtsp.h"
#include <stdarg.h>
#include <unistd.h>
......@@ -47,11 +50,8 @@
#include <dlfcn.h>
#endif
#include "network.h"
#include "version.h"
#include "ffserver.h"
#include "random.h"
#include "avstring.h"
#include "cmdutils.h"
#undef exit
......
......@@ -32,12 +32,12 @@
#include <math.h>
#include <string.h>
#include "libavutil/crc.h"
#include "libavutil/random.h"
#include "avcodec.h"
#include "ac3_parser.h"
#include "bitstream.h"
#include "crc.h"
#include "dsputil.h"
#include "random.h"
/** Maximum possible frame size when the specification limit is ignored */
#define AC3_MAX_FRAME_SIZE 21695
......
......@@ -25,9 +25,9 @@
*/
//#define DEBUG
//#define DEBUG_BITALLOC
#include "libavutil/crc.h"
#include "avcodec.h"
#include "bitstream.h"
#include "crc.h"
#include "ac3.h"
typedef struct AC3EncodeContext {
......
......@@ -22,7 +22,7 @@
#ifndef FFMPEG_AC3TAB_H
#define FFMPEG_AC3TAB_H
#include "common.h"
#include "libavutil/common.h"
extern const uint16_t ff_ac3_frame_size_tab[38][3];
extern const uint8_t ff_ac3_channels_tab[8];
......
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavcodec/dsputil.h"
#include "asm.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);
......
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavcodec/dsputil.h"
#include "asm.h"
#include "dsputil.h"
void get_pixels_mvi(DCTELEM *restrict block,
const uint8_t *restrict pixels, int line_size)
......
......@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
#include "asm.h"
#include "dsputil.h"
#include "mpegvideo.h"
static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block,
int n, int qscale)
......
......@@ -26,8 +26,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavcodec/dsputil.h"
#include "asm.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 "libavcodec/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 "libavcodec/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");
......
......@@ -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 "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
extern void MPV_common_init_iwmmxt(MpegEncContext *s);
extern void MPV_common_init_armv5te(MpegEncContext *s);
......
......@@ -19,9 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dsputil.h"
#include "mpegvideo.h"
#include "avcodec.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.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 "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s,
DCTELEM *block, int n, int qscale)
......
......@@ -27,7 +27,7 @@
* @sa http://www.svatopluk.com/andux/docs/dfvid.html
*/
#include "common.h"
#include "libavutil/common.h"
#include "dsputil.h"
#include "bethsoftvideo.h"
#include "bytestream.h"
......
......@@ -26,8 +26,8 @@
* @sa http://wiki.multimedia.cx/index.php?title=BFI
*/
#include "libavutil/common.h"
#include "avcodec.h"
#include "common.h"
#include "bytestream.h"
typedef struct BFIContext {
......
......@@ -22,8 +22,8 @@
*/
#include <unistd.h>
#include "avcodec.h"
#include "dsputil.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "dsputil_bfin.h"
int off;
......
......@@ -20,9 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dsputil.h"
#include "mpegvideo.h"
#include "avcodec.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
#include "dsputil_bfin.h"
......
......@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avcodec.h"
#include "dsputil.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "dsputil_bfin.h"
extern void ff_bfin_vp3_idct (DCTELEM *block) attribute_l1_text;
......
......@@ -29,10 +29,10 @@
#include <stdint.h>
#include <stdlib.h>
#include <assert.h>
#include "common.h"
#include "bswap.h"
#include "intreadwrite.h"
#include "log.h"
#include "libavutil/bswap.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/log.h"
#if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER)
# define ALT_BITSTREAM_READER
......
......@@ -22,7 +22,7 @@
#ifndef FFMPEG_BYTESTREAM_H
#define FFMPEG_BYTESTREAM_H
#include "common.h"
#include "libavutil/common.h"
#define DEF_T(type, name, bytes, read, write) \
static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\
......
......@@ -26,7 +26,7 @@
#include <string.h>
#include "common.h"
#include "libavutil/common.h"
#include "bitstream.h"
#include "cabac.h"
......
......@@ -32,7 +32,7 @@
//#undef NDEBUG
#include <assert.h>
#ifdef ARCH_X86
#include "x86_cpu.h"
#include "libavutil/x86_cpu.h"
#endif
#define CABAC_BITS 16
......
......@@ -46,11 +46,11 @@
#include <stddef.h>
#include <stdio.h>
#include "libavutil/random.h"
#include "avcodec.h"
#include "bitstream.h"
#include "dsputil.h"
#include "bytestream.h"
#include "random.h"
#include "cookdata.h"
......
......@@ -26,7 +26,7 @@
#ifdef CONFIG_ZLIB
#include <zlib.h>
#endif
#include "lzo.h"
#include "libavutil/lzo.h"
typedef struct {
AVFrame pic;
......
......@@ -27,8 +27,8 @@
#ifndef FFMPEG_DVDATA_H
#define FFMPEG_DVDATA_H
#include "libavutil/rational.h"
#include "avcodec.h"
#include "rational.h"
/*
* DVprofile is used to express the differences between various
......
......@@ -25,9 +25,9 @@
#include <string.h>
#include "libavutil/random.h"
#include "elbg.h"
#include "avcodec.h"
#include "random.h"
#define DELTA_ERR_MAX 0.1 ///< Precision of the ELBG algorithm (as percentual error)
......
......@@ -21,7 +21,7 @@
#ifndef FFMPEG_ELBG_H
#define FFMPEG_ELBG_H
#include "random.h"
#include "libavutil/random.h"
/**
* Implementation of the Enhanced LBG Algorithm
......
......@@ -36,10 +36,10 @@
#include <limits.h>
#define ALT_BITSTREAM_READER
#include "libavutil/crc.h"
#include "avcodec.h"
#include "bitstream.h"
#include "golomb.h"
#include "crc.h"
#include "flac.h"
#undef NDEBUG
......
......@@ -19,12 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/crc.h"
#include "libavutil/lls.h"
#include "avcodec.h"
#include "bitstream.h"
#include "crc.h"
#include "dsputil.h"
#include "golomb.h"
#include "lls.h"
#define FLAC_MAX_CH 8
#define FLAC_MIN_BLOCKSIZE 16
......
......@@ -40,8 +40,8 @@
#include <string.h>
#include <unistd.h>
#include "libavutil/bswap.h"
#include "avcodec.h"
#include "bswap.h"
#define FLI_256_COLOR 4
#define FLI_DELTA 7
......
......@@ -26,7 +26,7 @@
* @author Michael Niedermayer <michaelni@gmx.at>
*/
#include "common.h"
#include "libavutil/common.h"
const uint8_t ff_golomb_vlc_len[512]={
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
......
......@@ -30,8 +30,8 @@
#define FFMPEG_H264DATA_H
#include <stdint.h>
#include "libavutil/rational.h"
#include "mpegvideo.h"
#include "rational.h"
#define EXTENDED_SAR 255
......
......@@ -17,7 +17,7 @@
*/
#include "common.h"
#include "libavutil/common.h"
#include "bitstream.h"
#include "mpegvideo.h"
#include "h264data.h"
......
......@@ -28,7 +28,7 @@
#ifndef FFMPEG_H264PRED_H
#define FFMPEG_H264PRED_H
#include "common.h"
#include "libavutil/common.h"
/**
* Prediction types
......
......@@ -22,10 +22,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dsputil.h"
#include "libavutil/common.h"
#include "libavutil/x86_cpu.h"
#include "libavcodec/dsputil.h"
#include "dsputil_mmx.h"
#include "common.h"
#include "x86_cpu.h"
/*****************************************************************************
*
......
......@@ -21,8 +21,8 @@
*/
#include <stdlib.h>
#include "dsputil.h"
#include "x86_cpu.h"
#include "libavutil/x86_cpu.h"
#include "libavcodec/dsputil.h"
#undef printf
......
......@@ -22,16 +22,16 @@
* MMX optimization by Nick Kurshev <nickols_k@mail.ru>
*/
#include "dsputil.h"
#include "libavutil/x86_cpu.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/h263.h"
#include "libavcodec/mpegvideo.h"
#include "libavcodec/simple_idct.h"
#include "dsputil_mmx.h"
#include "simple_idct.h"
#include "mpegvideo.h"
#include "x86_cpu.h"
#include "mmx.h"
#include "vp3dsp_mmx.h"
#include "vp3dsp_sse2.h"
#include "idct_xvid.h"
#include "h263.h"
//#undef NDEBUG
//#include <assert.h>
......
......@@ -23,7 +23,7 @@
#define FFMPEG_DSPUTIL_MMX_H
#include <stdint.h>
#include "dsputil.h"
#include "libavcodec/dsputil.h"
typedef struct { uint64_t a, b; } xmm_t;
......
......@@ -22,10 +22,10 @@
* MMX optimization by Nick Kurshev <nickols_k@mail.ru>
*/
#include "dsputil.h"
#include "libavutil/x86_cpu.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.h"
#include "mpegvideo.h"
#include "x86_cpu.h"
static void get_pixels_mmx(DCTELEM *block, const uint8_t *pixels, int line_size)
......
......@@ -29,8 +29,9 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "common.h"
#include "dsputil.h"
#include "libavutil/common.h"
#include "libavcodec/dsputil.h"
#include "mmx.h"
#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))
......
......@@ -19,8 +19,9 @@
* 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 "x86_cpu.h"
#include "libavutil/x86_cpu.h"
#include "libavcodec/dsputil.h"
static const int p1m1[2] __attribute__((aligned(8))) =
{ 0, 1 << 31 };
......
......@@ -19,8 +19,9 @@
* 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 "x86_cpu.h"
#include "libavutil/x86_cpu.h"
#include "libavcodec/dsputil.h"
static const int p1m1[2] __attribute__((aligned(8))) =
{ 0, 1 << 31 };
......
......@@ -18,8 +18,9 @@
* 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 "x86_cpu.h"
#include "libavutil/x86_cpu.h"
#include "libavcodec/dsputil.h"
static const int p1p1p1m1[4] __attribute__((aligned(16))) =
{ 0, 0, 0, 1 << 31 };
......
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/x86_cpu.h"
#include "dsputil_mmx.h"
#include "x86_cpu.h"
static void apply_welch_window_sse2(const int32_t *data, int len, double *w_data)
{
......
......@@ -29,8 +29,7 @@
#ifndef FFMPEG_H264_I386_H
#define FFMPEG_H264_I386_H
#include "cabac.h"
#include "libavcodec/cabac.h"
//FIXME use some macros to avoid duplicating get_cabac (cannot be done yet
//as that would make optimization work hard)
......
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "common.h"
#include "dsputil.h"
#include "libavutil/common.h"
#include "libavcodec/dsputil.h"
#include "mmx.h"
......
......@@ -40,7 +40,7 @@
*/
#include <inttypes.h>
#include "avcodec.h"
#include "libavcodec/avcodec.h"
//=============================================================================
// Macros and other preprocessor constants
......
......@@ -38,7 +38,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dsputil.h"
#include "libavcodec/dsputil.h"
/*!
* @file idct_sse2_xvid.c
......
......@@ -21,8 +21,9 @@
* 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 "x86_cpu.h"
#include "libavutil/x86_cpu.h"
#include "libavcodec/dsputil.h"
DECLARE_ASM_CONST(8, uint64_t, round_tab[3])={
0x0000000000000000ULL,
......
......@@ -22,11 +22,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "dsputil.h"
#include "libavutil/x86_cpu.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.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 "libavcodec/dsputil.h"
#include "libavcodec/simple_idct.h"