Mercurial > mplayer.hg

changeset 16985:08cac43f1e38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unify include paths, -I.. is in CFLAGS.
author diego
date Mon, 14 Nov 2005 00:30:37 +0000
parents 94b70ab52695
children aaf0e1a3f6f9
files osdep/fseeko.c osdep/getch2-win.c osdep/getch2.c osdep/gettimeofday.c osdep/glob-win.c osdep/glob.h osdep/scandir.c osdep/shmem.c osdep/strl.c osdep/strsep.c osdep/swab.c osdep/timer-darwin.c osdep/timer-lx.c osdep/vsscanf.c postproc/cs_test.c postproc/rgb2rgb.c postproc/swscale-example.c postproc/swscale.c postproc/swscale_internal.h postproc/yuv2rgb.c postproc/yuv2rgb_altivec.c postproc/yuv2rgb_mlib.c
diffstat 22 files changed, 37 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/osdep/fseeko.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/fseeko.c	Mon Nov 14 00:30:37 2005 +0000
@@ -3,7 +3,7 @@
  *	  64-bit versions of fseeko/ftello() for systems which do not have them
  */
 
-#include "../config.h"
+#include "config.h"
  
 #if !defined(HAVE_FSEEKO) || !defined(HAVE_FTELLO)
 #include <stdio.h>
--- a/osdep/getch2-win.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/getch2-win.c	Mon Nov 14 00:30:37 2005 +0000
@@ -6,7 +6,7 @@
 
 #include <windows.h>
 #include "keycodes.h"
-#include "../input/input.h"
+#include "input/input.h"
 
 int mp_input_win32_slave_cmd_func(int fd,char* dest,int size){
   DWORD retval;
--- a/osdep/getch2.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/getch2.c	Mon Nov 14 00:30:37 2005 +0000
@@ -1,6 +1,6 @@
 /* GyS-TermIO v2.0 (for GySmail v3)          (C) 1999 A'rpi/ESP-team */
 
-#include "../config.h"
+#include "config.h"
 
 //#define USE_TERMCAP
 #if !defined(__OS2__) && !defined(__MORPHOS__)
--- a/osdep/gettimeofday.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/gettimeofday.c	Mon Nov 14 00:30:37 2005 +0000
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_GETTIMEOFDAY
 #include <sys/time.h>
--- a/osdep/glob-win.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/glob-win.c	Mon Nov 14 00:30:37 2005 +0000
@@ -1,7 +1,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_GLOB
 #ifdef __MINGW32__
--- a/osdep/glob.h	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/glob.h	Mon Nov 14 00:30:37 2005 +0000
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_GLOB
 #ifdef __MINGW32__
--- a/osdep/scandir.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/scandir.c	Mon Nov 14 00:30:37 2005 +0000
@@ -4,7 +4,7 @@
  * implementation for systems that do not have it in libc
  */
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef	HAVE_SCANDIR
 
--- a/osdep/shmem.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/shmem.c	Mon Nov 14 00:30:37 2005 +0000
@@ -6,7 +6,7 @@
  *   Sun Apr  6 02:26:26 MET DST 1997
  */
 
-#include "../config.h"
+#include "config.h"
 
 #if defined(USE_STREAM_CACHE) && !defined(WIN32)
 
@@ -26,7 +26,7 @@
 #include <sys/socket.h>
 #include <fcntl.h>
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #ifdef AIX
 #include <sys/select.h>
--- a/osdep/strl.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/strl.c	Mon Nov 14 00:30:37 2005 +0000
@@ -4,7 +4,7 @@
  * (C) 2003-2004 Nicholas J. Kain <njk@aerifal.cx>
  */
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_STRLCPY
 unsigned int strlcpy (char *dest, const char *src, unsigned int size)
--- a/osdep/strsep.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/strsep.c	Mon Nov 14 00:30:37 2005 +0000
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../config.h"
+#include "config.h"
 
 #ifndef HAVE_STRSEP
 char *strsep(char **stringp, const char *delim) {
--- a/osdep/swab.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/swab.c	Mon Nov 14 00:30:37 2005 +0000
@@ -1,8 +1,8 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef	HAVE_SWAB
 /* system has no swab.  emulate via bswap */
-#include "../bswap.h"
+#include "bswap.h"
 #include <unistd.h>
 
 void swab(const void *from, void *to, ssize_t n) {
--- a/osdep/timer-darwin.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/timer-darwin.c	Mon Nov 14 00:30:37 2005 +0000
@@ -22,8 +22,8 @@
 #include <sys/time.h>
 #include <mach/mach_time.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
+#include "config.h"
+#include "mp_msg.h"
 #include "timer.h"
 
 /* global variables */
--- a/osdep/timer-lx.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/timer-lx.c	Mon Nov 14 00:30:37 2005 +0000
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <sys/time.h>
-#include "../config.h"
+#include "config.h"
 
 const char *timer_name =
 #ifdef HAVE_NANOSLEEP
--- a/osdep/vsscanf.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/osdep/vsscanf.c	Mon Nov 14 00:30:37 2005 +0000
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #ifndef	HAVE_VSSCANF
 /* system has no vsscanf.  try to provide one */
--- a/postproc/cs_test.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/postproc/cs_test.c	Mon Nov 14 00:30:37 2005 +0000
@@ -22,7 +22,7 @@
 
 #include "swscale.h"
 #include "rgb2rgb.h"
-#include "../cpudetect.h"
+#include "cpudetect.h"
 
 #define SIZE 1000
 #define srcByte 0x55
--- a/postproc/rgb2rgb.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/postproc/rgb2rgb.c	Mon Nov 14 00:30:37 2005 +0000
@@ -8,13 +8,13 @@
  *  palette & yuv & runtime cpu stuff by Michael (michaelni@gmx.at) (under GPL)
  */
 #include <inttypes.h>
-#include "../config.h"
+#include "config.h"
 #include "rgb2rgb.h"
 #include "swscale.h"
-#include "../cpudetect.h"
-#include "../mangle.h"
-#include "../bswap.h"
-#include "../libvo/fastmemcpy.h"
+#include "cpudetect.h"
+#include "mangle.h"
+#include "bswap.h"
+#include "libvo/fastmemcpy.h"
 
 #define FAST_BGR2YV12 // use 7 bit coeffs instead of 15bit
 
--- a/postproc/swscale-example.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/postproc/swscale-example.c	Mon Nov 14 00:30:37 2005 +0000
@@ -22,10 +22,10 @@
 #include <inttypes.h>
 #include <stdarg.h>
 
-#include "../config.h"
+#include "config.h"
 
 #include "swscale.h"
-#include "../libvo/img_format.h"
+#include "libvo/img_format.h"
 
 static int testFormat[]={
 IMGFMT_YVU9,
--- a/postproc/swscale.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/postproc/swscale.c	Mon Nov 14 00:30:37 2005 +0000
@@ -54,8 +54,8 @@
 #include <math.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "../config.h"
-#include "../mangle.h"
+#include "config.h"
+#include "mangle.h"
 #include <assert.h>
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -70,11 +70,11 @@
 #endif
 #include "swscale.h"
 #include "swscale_internal.h"
-#include "../cpudetect.h"
-#include "../bswap.h"
-#include "../libvo/img_format.h"
+#include "cpudetect.h"
+#include "bswap.h"
+#include "libvo/img_format.h"
 #include "rgb2rgb.h"
-#include "../libvo/fastmemcpy.h"
+#include "libvo/fastmemcpy.h"
 
 #undef MOVNTQ
 #undef PAVGB
--- a/postproc/swscale_internal.h	Sun Nov 13 21:53:26 2005 +0000
+++ b/postproc/swscale_internal.h	Mon Nov 14 00:30:37 2005 +0000
@@ -29,7 +29,7 @@
 #define AVV(x...) {x}
 #endif
 
-#include "../mp_msg.h"
+#include "mp_msg.h"
 
 #define MSG_WARN(args...) mp_msg(MSGT_SWS,MSGL_WARN, ##args )
 #define MSG_FATAL(args...) mp_msg(MSGT_SWS,MSGL_FATAL, ##args )
--- a/postproc/yuv2rgb.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/postproc/yuv2rgb.c	Mon Nov 14 00:30:37 2005 +0000
@@ -40,8 +40,8 @@
 #include "rgb2rgb.h"
 #include "swscale.h"
 #include "swscale_internal.h"
-#include "../mangle.h"
-#include "../libvo/img_format.h" //FIXME try to reduce dependency of such stuff
+#include "mangle.h"
+#include "libvo/img_format.h" //FIXME try to reduce dependency of such stuff
 
 #ifdef HAVE_MLIB
 #include "yuv2rgb_mlib.c"
--- a/postproc/yuv2rgb_altivec.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/postproc/yuv2rgb_altivec.c	Mon Nov 14 00:30:37 2005 +0000
@@ -71,8 +71,8 @@
 #include "rgb2rgb.h"
 #include "swscale.h"
 #include "swscale_internal.h"
-#include "../mangle.h"
-#include "../libvo/img_format.h" //FIXME try to reduce dependency of such stuff
+#include "mangle.h"
+#include "libvo/img_format.h" //FIXME try to reduce dependency of such stuff
 
 #undef PROFILE_THE_BEAST
 #undef INC_SCALING
--- a/postproc/yuv2rgb_mlib.c	Sun Nov 13 21:53:26 2005 +0000
+++ b/postproc/yuv2rgb_mlib.c	Mon Nov 14 00:30:37 2005 +0000
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "../libvo/img_format.h" //FIXME try to reduce dependency of such stuff
+#include "libvo/img_format.h" //FIXME try to reduce dependency of such stuff
 #include "swscale.h"
 
 static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,