diff options
47 files changed, 89 insertions, 89 deletions
diff --git a/Gui/Makefile b/Gui/Makefile index db2567f031..fa608e5345 100644 --- a/Gui/Makefile +++ b/Gui/Makefile @@ -4,7 +4,7 @@ LIB = libgui.a include ../config.mak include config.mak -INCDIR = -I. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC) $(EXTRA_INC) +INCDIR = -I. -I.. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC) $(EXTRA_INC) OPTIMIZE = $(OPTFLAGS) \ -fexpensive-optimizations -fschedule-insns2 -Wall @@ -35,7 +35,7 @@ AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(JACK_LIB) $(NAS_LIB) $(SGIAUDIO_LIB) CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB) COMMON_LIBS = libmpcodecs/libmpcodecs.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB) -CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall +CFLAGS = $(OPTFLAGS) -I. $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall ifeq ($(TOOLAME),yes) CFLAGS += $(TOOLAME_EXTRAFLAGS) CODEC_LIBS += $(TOOLAME_LIB) diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 53d091f732..d170e4c8bc 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -34,7 +34,7 @@ endif OBJS = $(SRCS:.c=.o) OBJS += $(CPLUSPLUSSRCS:.cpp=.o) -INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) +INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) CPLUSPLUS = $(CC) diff --git a/libvo/aclib.c b/libvo/aclib.c index a3330eafef..5f2c1f64df 100644 --- a/libvo/aclib.c +++ b/libvo/aclib.c @@ -8,7 +8,7 @@ runtime cpu detection by michael niedermayer (michaelni@gmx.at) is under GPL */ #include <stddef.h> -#include "../cpudetect.h" +#include "cpudetect.h" #include "fastmemcpy.h" #undef memcpy diff --git a/libvo/aspect.c b/libvo/aspect.c index c89b92a0ab..6ad368a932 100644 --- a/libvo/aspect.c +++ b/libvo/aspect.c @@ -2,7 +2,7 @@ #include "aspect.h" #include "geometry.h" #ifndef ASPECT_TEST -#include "../mp_msg.h" +#include "mp_msg.h" #endif //#define ASPECT_DEBUG diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index cd7d91d1cd..a1a07a2c76 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -1,7 +1,7 @@ #ifndef __MPLAYER_MEMCPY #define __MPLAYER_MEMCPY 1 -#include "../config.h" +#include "config.h" #ifdef USE_FASTMEMCPY #if defined(HAVE_MMX) || defined(HAVE_MMX2) || defined(HAVE_3DNOW) \ diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index 1e88454ca5..74f9abc98f 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -28,10 +28,10 @@ #include <fontconfig/fontconfig.h> #endif -#include "../bswap.h" +#include "bswap.h" #include "font_load.h" #include "mp_msg.h" -#include "../mplayer.h" +#include "mplayer.h" #include "osd_font.h" #if (FREETYPE_MAJOR > 2) || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 1) diff --git a/libvo/geometry.c b/libvo/geometry.c index d3d68c8ca7..fbafb5a955 100644 --- a/libvo/geometry.c +++ b/libvo/geometry.c @@ -3,7 +3,7 @@ #include <stdio.h> #include <string.h> #include "geometry.h" -#include "../mp_msg.h" +#include "mp_msg.h" /* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */ char *vo_geometry = NULL; diff --git a/libvo/img_format.h b/libvo/img_format.h index 0ed3c65aff..7ed739c564 100644 --- a/libvo/img_format.h +++ b/libvo/img_format.h @@ -1,2 +1,2 @@ -#include "../libmpcodecs/img_format.h" +#include "libmpcodecs/img_format.h" diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c index ba2596f398..75764bba3d 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -31,13 +31,13 @@ #ifdef USE_FASTMEMCPY #include "fastmemcpy.h" #endif -#include "../mp_msg.h" +#include "mp_msg.h" /* We need this #define because we need ../libavcodec/common.h to #define * be2me_32, otherwise the linker will complain that it doesn't exist */ #define HAVE_AV_CONFIG_H -#include "../libavcodec/avcodec.h" -#include "../libavcodec/dsputil.h" -#include "../libavcodec/mpegvideo.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/dsputil.h" +#include "libavcodec/mpegvideo.h" #include "jpeg_enc.h" diff --git a/libvo/mga_common.c b/libvo/mga_common.c index 35cfc59eb5..6adb31aa2e 100644 --- a/libvo/mga_common.c +++ b/libvo/mga_common.c @@ -1,9 +1,9 @@ #include "fastmemcpy.h" -#include "../cpudetect.h" -#include "../postproc/swscale.h" -#include "../postproc/rgb2rgb.h" -#include "../libmpcodecs/vf_scale.h" +#include "cpudetect.h" +#include "postproc/swscale.h" +#include "postproc/rgb2rgb.h" +#include "libmpcodecs/vf_scale.h" #include "mp_msg.h" // mga_vid drawing functions diff --git a/libvo/osd.c b/libvo/osd.c index 3c616dc0de..6e11a81b90 100644 --- a/libvo/osd.c +++ b/libvo/osd.c @@ -9,8 +9,8 @@ #include "osd.h" #include "mp_msg.h" #include <inttypes.h> -#include "../cpudetect.h" -#include "../mangle.h" +#include "cpudetect.h" +#include "mangle.h" extern int verbose; // defined in mplayer.c diff --git a/libvo/sub.c b/libvo/sub.c index e237dd5eeb..c645483925 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -12,7 +12,7 @@ #include "video_out.h" #include "font_load.h" #include "sub.h" -#include "../spudec.h" +#include "spudec.h" #define NEW_SPLITTING diff --git a/libvo/sub.h b/libvo/sub.h index 782fa12af2..d257e86913 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -56,7 +56,7 @@ static inline void vo_draw_text_osd(int dxs,int dys,void (*draw_alpha)(int x0,in #else -#include "../subreader.h" +#include "subreader.h" extern unsigned char* vo_osd_text; diff --git a/libvo/vesa_lvo.c b/libvo/vesa_lvo.c index 5ce0b6e733..8b914475b2 100644 --- a/libvo/vesa_lvo.c +++ b/libvo/vesa_lvo.c @@ -23,7 +23,7 @@ #include "vesa_lvo.h" #include "img_format.h" -#include "../drivers/mga_vid.h" /* <- should be changed to "linux/'something'.h" */ +#include "drivers/mga_vid.h" /* <- should be changed to "linux/'something'.h" */ #include "fastmemcpy.h" #include "osd.h" #include "video_out.h" diff --git a/libvo/video_out.c b/libvo/video_out.c index d621a1599f..7eef722b3d 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -15,7 +15,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "../osdep/shmem.h" +#include "osdep/shmem.h" //int vo_flags=0; diff --git a/libvo/video_out.h b/libvo/video_out.h index e16bd2d7c3..1ed670eb3e 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -15,7 +15,7 @@ //#include "font_load.h" #include "img_format.h" -//#include "../vidix/vidix.h" +//#include "vidix/vidix.h" #define VO_EVENT_EXPOSE 1 #define VO_EVENT_RESIZE 2 diff --git a/libvo/video_out_internal.h b/libvo/video_out_internal.h index 7137a78e76..e395d211ab 100644 --- a/libvo/video_out_internal.h +++ b/libvo/video_out_internal.h @@ -22,8 +22,8 @@ */ /* All video drivers will want this */ -#include "../libmpcodecs/vfcap.h" -#include "../libmpcodecs/mp_image.h" +#include "libmpcodecs/vfcap.h" +#include "libmpcodecs/mp_image.h" #include "geometry.h" static uint32_t control(uint32_t request, void *data, ...); diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index 9d42123488..dea6d86bb2 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -27,8 +27,8 @@ #include "video_out.h" #include "video_out_internal.h" #include "aspect.h" -#include "../postproc/swscale.h" -#include "../libmpcodecs/vf_scale.h" +#include "postproc/swscale.h" +#include "libmpcodecs/vf_scale.h" #include "font_load.h" #include "sub.h" diff --git a/libvo/vo_bl.c b/libvo/vo_bl.c index 126ffccfba..b6ae8bff6f 100644 --- a/libvo/vo_bl.c +++ b/libvo/vo_bl.c @@ -43,8 +43,8 @@ #include "video_out.h" #include "video_out_internal.h" -#include "../mp_msg.h" -#include "../m_option.h" +#include "mp_msg.h" +#include "m_option.h" #include "fastmemcpy.h" static vo_info_t info = diff --git a/libvo/vo_cvidix.c b/libvo/vo_cvidix.c index e98c227923..8f9807831c 100644 --- a/libvo/vo_cvidix.c +++ b/libvo/vo_cvidix.c @@ -23,7 +23,7 @@ #include "mp_msg.h" #include "vosub_vidix.h" -#include "../vidix/vidixlib.h" +#include "vidix/vidixlib.h" static vo_info_t info = { diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c index 483752bfed..e12d1228a9 100644 --- a/libvo/vo_dfbmga.c +++ b/libvo/vo_dfbmga.c @@ -1339,7 +1339,7 @@ control( uint32_t request, void *data, ... ) extern void mplayer_put_key( int code ); -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" static void check_events( void ) diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c index 30bf24f37b..0c6eadadd2 100644 --- a/libvo/vo_dga.c +++ b/libvo/vo_dga.c @@ -21,7 +21,7 @@ #include "aspect.h" #include "x11_common.h" #include "fastmemcpy.h" -#include "../mp_msg.h" +#include "mp_msg.h" #include <X11/Xlib.h> #include <X11/extensions/xf86dga.h> diff --git a/libvo/vo_directfb.c b/libvo/vo_directfb.c index b3c5902a25..ba3251e5db 100644 --- a/libvo/vo_directfb.c +++ b/libvo/vo_directfb.c @@ -57,7 +57,7 @@ #include "video_out_internal.h" #include "fastmemcpy.h" #include "sub.h" -#include "../postproc/rgb2rgb.h" +#include "postproc/rgb2rgb.h" #include "aspect.h" @@ -1411,7 +1411,7 @@ static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h, int x, in extern void mplayer_put_key(int code); -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" static void check_events(void) { diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index cf2eeea935..7f6b356546 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -933,7 +933,7 @@ return 0; extern void mplayer_put_key(int code); -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" static void check_events(void) { diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index 0ae1297e86..850c41aec7 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -28,10 +28,10 @@ #include "video_out.h" #include "video_out_internal.h" #include "fastmemcpy.h" -#include "../input/input.h" -#include "../osdep/keycodes.h" -#include "../input/mouse.h" -#include "../mp_msg.h" +#include "input/input.h" +#include "osdep/keycodes.h" +#include "input/mouse.h" +#include "mp_msg.h" #include "aspect.h" #include "geometry.h" diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 0266c873ee..6f459c87e4 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -141,7 +141,7 @@ #include "spuenc.h" #include "sub.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif #ifdef HAVE_X11 #include "x11_common.h" diff --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c index 60a1ad8d9a..4628b66779 100644 --- a/libvo/vo_ggi.c +++ b/libvo/vo_ggi.c @@ -533,7 +533,7 @@ static uint32_t control(uint32_t request, void *data, ...) } /* EVENT handling */ -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" extern void mplayer_put_key(int code); static void check_events(void) diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 976ff29838..8e3ba4e8d7 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -17,7 +17,7 @@ #include "sub.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif #include <GL/gl.h> diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index 84fc83b1d1..bdf323a5a4 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -31,8 +31,8 @@ #include "mp_msg.h" #include "m_option.h" -#include "../input/input.h" -#include "../input/mouse.h" +#include "input/input.h" +#include "input/mouse.h" #include "vo_quartz.h" @@ -112,7 +112,7 @@ enum kFullScreenCmd = 5 }; -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" extern void mplayer_put_key(int code); extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index 59dccde1ab..e320709bb2 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -119,8 +119,8 @@ #include "x11_common.h" #endif -#include "../input/input.h" -#include "../input/mouse.h" +#include "input/input.h" +#include "input/mouse.h" extern int verbose; int sdl_noxv; @@ -1165,7 +1165,7 @@ static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int * returns : doesn't return **/ -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" extern void mplayer_put_key(int code); #define shift_key (event.key.keysym.mod==(KMOD_LSHIFT||KMOD_RSHIFT)) diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c index 79557f288d..9989d2a32c 100644 --- a/libvo/vo_svga.c +++ b/libvo/vo_svga.c @@ -44,8 +44,8 @@ TODO: #include "sub.h" -#include "../mp_msg.h" -//#include "../mp_image.h" +#include "mp_msg.h" +//#include "mp_image.h" #include <assert.h> diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c index 662e463728..dfe9910f77 100644 --- a/libvo/vo_winvidix.c +++ b/libvo/vo_winvidix.c @@ -17,14 +17,14 @@ #include "video_out_internal.h" #include <windows.h> -#include "../osdep/keycodes.h" -#include "../input/input.h" +#include "osdep/keycodes.h" +#include "input/input.h" #include "aspect.h" #include "mp_msg.h" #include "vosub_vidix.h" -#include "../vidix/vidixlib.h" +#include "vidix/vidixlib.h" extern void mplayer_put_key(int code); diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 15ff744890..dcf989c7bc 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -38,16 +38,16 @@ int XShmGetEventBase(Display *); #include "fastmemcpy.h" #include "sub.h" -#include "../postproc/swscale.h" -#include "../postproc/swscale_internal.h" //FIXME -#include "../postproc/rgb2rgb.h" -#include "../libmpcodecs/vf_scale.h" +#include "postproc/swscale.h" +#include "postproc/swscale_internal.h" //FIXME +#include "postproc/rgb2rgb.h" +#include "libmpcodecs/vf_scale.h" -#include "../mp_msg.h" +#include "mp_msg.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" -#include "../mplayer.h" +#include "Gui/interface.h" +#include "mplayer.h" #endif static vo_info_t info = { diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index b9cd6cadd4..6253936436 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -38,13 +38,13 @@ #include "aspect.h" #ifdef SHOW_TIME -#include "../osdep/timer.h" +#include "osdep/timer.h" static unsigned int timer = 0; static unsigned int timerd = 0; #endif #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif static vo_info_t info = { diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c index e0f317f8e9..7f6e4c44f8 100644 --- a/libvo/vo_xover.c +++ b/libvo/vo_xover.c @@ -34,7 +34,7 @@ #include "mp_msg.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 767501ebda..74fa0a5de6 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -37,7 +37,7 @@ Buffer allocation: #include "aspect.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif static vo_info_t info = { diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index 8cab15fd58..7589f19423 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -31,10 +31,10 @@ #include "mp_msg.h" #include "vosub_vidix.h" -#include "../vidix/vidixlib.h" +#include "vidix/vidixlib.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 2c95d20746..91d83942ef 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -31,7 +31,7 @@ #include "aspect.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif //no chanse xinerama to be suported in near future diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c index 3f977cebd9..a76b186f24 100644 --- a/libvo/vo_yuv4mpeg.c +++ b/libvo/vo_yuv4mpeg.c @@ -38,8 +38,8 @@ #include "sub.h" #include "fastmemcpy.h" -#include "../postproc/rgb2rgb.h" -#include "../libmpcodecs/vf_scale.h" +#include "postproc/rgb2rgb.h" +#include "libmpcodecs/vf_scale.h" static vo_info_t info = { diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c index df0536a3d5..6c06a13f22 100644 --- a/libvo/vo_zr.c +++ b/libvo/vo_zr.c @@ -24,8 +24,8 @@ #include "video_out.h" #include "video_out_internal.h" -#include "../mp_msg.h" -#include "../m_option.h" +#include "mp_msg.h" +#include "m_option.h" #include "fastmemcpy.h" #include "jpeg_enc.h" diff --git a/libvo/vo_zr2.c b/libvo/vo_zr2.c index 02ba3deb71..7cf54fc509 100644 --- a/libvo/vo_zr2.c +++ b/libvo/vo_zr2.c @@ -25,7 +25,7 @@ #include "video_out.h" #include "video_out_internal.h" -#include "../mp_msg.h" +#include "mp_msg.h" #include "fastmemcpy.h" static vo_info_t info = { diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 49851a7e78..83d16dd9c7 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -26,14 +26,14 @@ #include "config.h" #include "vosub_vidix.h" -#include "../vidix/vidixlib.h" +#include "vidix/vidixlib.h" #include "fastmemcpy.h" #include "osd.h" #include "video_out.h" #include "sub.h" -#include "../libmpcodecs/vfcap.h" -#include "../libmpcodecs/mp_image.h" +#include "libmpcodecs/vfcap.h" +#include "libmpcodecs/mp_image.h" #define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */ diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h index bc842b2549..9246c49071 100644 --- a/libvo/vosub_vidix.h +++ b/libvo/vosub_vidix.h @@ -29,7 +29,7 @@ uint32_t vidix_draw_frame(uint8_t *src[]); void vidix_flip_page(void); void vidix_draw_osd(void); -#include "../vidix/vidix.h" +#include "vidix/vidix.h" /* graphic keys */ int vidix_grkey_support(void); int vidix_grkey_get(vidix_grkey_t *gr_key); diff --git a/libvo/w32_common.c b/libvo/w32_common.c index fff28aebe4..fe89cbabf8 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -1,10 +1,10 @@ #include <limits.h> #include <windows.h> -#include "../osdep/keycodes.h" -#include "../input/input.h" -#include "../input/mouse.h" -#include "../mp_msg.h" +#include "osdep/keycodes.h" |