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

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"
......
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