October 2004 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libvo vo_quartz.c,1.32,1.33
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv32112 Modified Files: vo_quartz.c Log Message: autodetect proper monitor aspect Index: vo_quartz.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- vo_quartz.c 28 Oct 2004 14:52:47 -0000 1.32 +++ vo_quartz.c 28 Oct 2004 21:48:41 -0000 1.33 @@ -71,6 +71,7 @@ extern int vo_ontop; extern int vo_fs; // user want fullscreen static int vo_quartz_fs; // we are in fullscreen +extern float monitor_aspect; static int winLevel = 1; int levelList[] = @@ -502,6 +503,8 @@ device_width = deviceRect.right-deviceRect.left; device_height = deviceRect.bottom-deviceRect.top; + monitor_aspect = (float)device_width/(float)device_height; + //misc mplayer setup///////////////////////////////////////////////////// SetRect(&imgRect, 0, 0, width, height); switch (image_format)

1 0

CVS: main/TOOLS vivodump.c,1.8,1.9
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/TOOLS In directory mail:/var2/tmp/cvs-serv30824 Modified Files: vivodump.c Log Message: Remove hardcoded filenames in favor of command line parameters, some error checking added, patch by Reza Jelveh. Index: vivodump.c =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/vivodump.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- vivodump.c 28 Oct 2004 00:50:21 -0000 1.8 +++ vivodump.c 28 Oct 2004 01:02:24 -0000 1.9 @@ -151,15 +151,15 @@ int postable[32768]; -int main(){ +int main(int argv,char ** argc){ int c; unsigned int head=-1; int pos=0; int frames=0; -FILE *f=fopen("paulvandykforanangel.viv","rb"); -FILE *f2=fopen("GB1.avi","wb"); -muxer_t* avi=muxer_new_muxer(MUXER_TYPE_AVI,f2); -muxer_stream_t* mux=muxer_new_stream(avi,MUXER_TYPE_VIDEO); +FILE *f; +FILE *f2; +muxer_t* avi; +muxer_stream_t* mux; //unsigned char* buffer=malloc(0x200000); int i,len; int v_id=0; @@ -167,6 +167,20 @@ int flag2=0; int prefix=0; +// input +if(!(f=fopen(argc[1],"rb"))){ + printf("Couldn't open input file.\n"); + return -1; +} +// output +if(!(f2=fopen(argc[2],"wb"))){ + printf("Couldn't open output file.\n"); + return -1; +} + +avi=muxer_new_muxer(MUXER_TYPE_AVI,f2); +mux=muxer_new_stream(avi,MUXER_TYPE_VIDEO); + mux->buffer_size=0x200000; mux->buffer=malloc(mux->buffer_size);

4 7

CVS: main/libvo vo_quartz.c,1.31,1.32
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv12382/libvo Modified Files: vo_quartz.c Log Message: let you choose fullscreen resolution for slower system Index: vo_quartz.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- vo_quartz.c 28 Oct 2004 01:15:52 -0000 1.31 +++ vo_quartz.c 28 Oct 2004 14:52:47 -0000 1.32 @@ -87,6 +87,9 @@ static int device_height; static int device_id; +static short fs_res_x=0; +static short fs_res_y=0; + static WindowRef theWindow = NULL; static WindowGroupRef winGroup = NULL; static CGContextRef context; @@ -928,6 +931,13 @@ parse_pos = &parse_pos[10]; device_id = strtol(parse_pos, &parse_pos, 0); } + if (strncmp (parse_pos, "fs_res=", 7) == 0) + { + parse_pos = &parse_pos[7]; + fs_res_x = strtol(parse_pos, &parse_pos, 0); + parse_pos = &parse_pos[1]; + fs_res_y = strtol(parse_pos, &parse_pos, 0); + } if (parse_pos[0] == ':') parse_pos = &parse_pos[1]; else if (parse_pos[0]) parse_err = 1; } @@ -1135,6 +1145,8 @@ void window_ontop() { + if(!vo_quartz_fs) + { //Cycle between level winLevel++; if(winLevel>2) @@ -1155,11 +1167,16 @@ } } + } SetWindowGroupLevel(winGroup, CGWindowLevelForKey(levelList[winLevel])); } void window_fullscreen() { + static Ptr restoreState = NULL; + RGBColor black={0,0,0}; + GDHandle deviceHdl; + //go fullscreen if(vo_fs) { @@ -1167,6 +1184,18 @@ { HideMenuBar(); HideCursor(); + + if(fs_res_x != 0 || fs_res_y != 0) + { + BeginFullScreen( &restoreState, NULL, &fs_res_x, &fs_res_y, NULL, &black, NULL); + + //Get Main device info/////////////////////////////////////////////////// + deviceHdl = GetMainDevice(); + deviceRect = (*deviceHdl)->gdRect; + + device_width = deviceRect.right; + device_height = deviceRect.bottom; + } } //save old window size @@ -1183,6 +1212,18 @@ } else //go back to windowed mode { + if(restoreState != NULL) + { + EndFullScreen(restoreState, NULL); + + //Get Main device info/////////////////////////////////////////////////// + deviceHdl = GetMainDevice(); + deviceRect = (*deviceHdl)->gdRect; + + device_width = deviceRect.right; + device_height = deviceRect.bottom; + restoreState = NULL; + } ShowMenuBar(); //show mouse cursor

1 0

[Mplayer-cvslog] CVS: main/libvo aclib.c, 1.13, 1.14 aspect.c, 1.16, 1.17 fastmemcpy.h, 1.20, 1.21 font_load_ft.c, 1.14, 1.15 geometry.c, 1.12, 1.13 img_format.h, 1.6, 1.7 jpeg_enc.c, 1.21, 1.22 mga_common.c, 1.59, 1.60 osd.c, 1.23, 1.24 sub.c, 1.75, 1.76 sub.h, 1.28, 1.29 vesa_lvo.c, 1.17, 1.18 video_out.c, 1.93, 1.94 video_out.h, 1.58, 1.59 video_out_internal.h, 1.14, 1.15 vo_aa.c, 1.43, 1.44 vo_bl.c, 1.7, 1.8 vo_cvidix.c, 1.11, 1.12 vo_dfbmga.c, 1.22, 1.23 vo_dga.c, 1.69, 1.70 vo_directfb.c, 1.28, 1.29 v
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv9525/libvo Modified Files: aclib.c aspect.c fastmemcpy.h font_load_ft.c geometry.c img_format.h jpeg_enc.c mga_common.c osd.c sub.c sub.h vesa_lvo.c video_out.c video_out.h video_out_internal.h vo_aa.c vo_bl.c vo_cvidix.c vo_dfbmga.c vo_dga.c vo_directfb.c vo_directfb2.c vo_directx.c vo_dxr3.c vo_ggi.c vo_gl2.c vo_quartz.c vo_sdl.c vo_svga.c vo_winvidix.c vo_x11.c vo_xmga.c vo_xover.c vo_xv.c vo_xvidix.c vo_xvmc.c vo_yuv4mpeg.c vo_zr.c vo_zr2.c vosub_vidix.c vosub_vidix.h w32_common.c x11_common.c Log Message: Handle "xxx.h" vs "../xxx.h" include paths in a consistent way. Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>. Index: aclib.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/aclib.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- aclib.c 21 Oct 2004 11:55:20 -0000 1.13 +++ aclib.c 28 Oct 2004 01:15:51 -0000 1.14 @@ -8,7 +8,7 @@ runtime cpu detection by michael niedermayer (michaelni(a)gmx.at) is under GPL */ #include <stddef.h> -#include "../cpudetect.h" +#include "cpudetect.h" #include "fastmemcpy.h" #undef memcpy Index: aspect.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/aspect.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- aspect.c 15 Oct 2003 15:17:09 -0000 1.16 +++ aspect.c 28 Oct 2004 01:15:51 -0000 1.17 @@ -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 Index: fastmemcpy.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/fastmemcpy.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fastmemcpy.h 25 Jun 2004 18:20:45 -0000 1.20 +++ fastmemcpy.h 28 Oct 2004 01:15:51 -0000 1.21 @@ -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) \ Index: font_load_ft.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/font_load_ft.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- font_load_ft.c 13 Oct 2004 16:22:59 -0000 1.14 +++ font_load_ft.c 28 Oct 2004 01:15:52 -0000 1.15 @@ -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) Index: geometry.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/geometry.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- geometry.c 24 Feb 2004 21:09:21 -0000 1.12 +++ geometry.c 28 Oct 2004 01:15:52 -0000 1.13 @@ -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; Index: img_format.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/img_format.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- img_format.h 13 Apr 2002 19:14:33 -0000 1.6 +++ img_format.h 28 Oct 2004 01:15:52 -0000 1.7 @@ -1,2 +1,2 @@ -#include "../libmpcodecs/img_format.h" +#include "libmpcodecs/img_format.h" Index: jpeg_enc.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/jpeg_enc.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jpeg_enc.c 16 Feb 2004 14:41:42 -0000 1.21 +++ jpeg_enc.c 28 Oct 2004 01:15:52 -0000 1.22 @@ -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" Index: mga_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- mga_common.c 28 Jan 2004 10:03:40 -0000 1.59 +++ mga_common.c 28 Oct 2004 01:15:52 -0000 1.60 @@ -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 Index: osd.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/osd.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- osd.c 21 Oct 2004 11:55:20 -0000 1.23 +++ osd.c 28 Oct 2004 01:15:52 -0000 1.24 @@ -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 Index: sub.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- sub.c 15 Sep 2004 13:16:52 -0000 1.75 +++ sub.c 28 Oct 2004 01:15:52 -0000 1.76 @@ -12,7 +12,7 @@ #include "video_out.h" #include "font_load.h" #include "sub.h" -#include "../spudec.h" +#include "spudec.h" #define NEW_SPLITTING Index: sub.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sub.h 4 Oct 2003 17:29:04 -0000 1.28 +++ sub.h 28 Oct 2004 01:15:52 -0000 1.29 @@ -56,7 +56,7 @@ #else -#include "../subreader.h" +#include "subreader.h" extern unsigned char* vo_osd_text; Index: vesa_lvo.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vesa_lvo.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- vesa_lvo.c 26 Jul 2002 12:42:43 -0000 1.17 +++ vesa_lvo.c 28 Oct 2004 01:15:52 -0000 1.18 @@ -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" Index: video_out.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- video_out.c 23 Oct 2004 22:43:19 -0000 1.93 +++ video_out.c 28 Oct 2004 01:15:52 -0000 1.94 @@ -15,7 +15,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "../osdep/shmem.h" +#include "osdep/shmem.h" //int vo_flags=0; Index: video_out.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- video_out.h 22 Aug 2004 19:01:56 -0000 1.58 +++ video_out.h 28 Oct 2004 01:15:52 -0000 1.59 @@ -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 Index: video_out_internal.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out_internal.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- video_out_internal.h 11 Nov 2002 15:20:25 -0000 1.14 +++ video_out_internal.h 28 Oct 2004 01:15:52 -0000 1.15 @@ -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, ...); Index: vo_aa.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- vo_aa.c 13 Aug 2003 16:45:02 -0000 1.43 +++ vo_aa.c 28 Oct 2004 01:15:52 -0000 1.44 @@ -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" Index: vo_bl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_bl.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- vo_bl.c 11 Aug 2004 13:39:32 -0000 1.7 +++ vo_bl.c 28 Oct 2004 01:15:52 -0000 1.8 @@ -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 = Index: vo_cvidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_cvidix.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vo_cvidix.c 17 Sep 2004 09:56:09 -0000 1.11 +++ vo_cvidix.c 28 Oct 2004 01:15:52 -0000 1.12 @@ -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 = { Index: vo_dfbmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dfbmga.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- vo_dfbmga.c 25 Sep 2004 13:46:21 -0000 1.22 +++ vo_dfbmga.c 28 Oct 2004 01:15:52 -0000 1.23 @@ -1339,7 +1339,7 @@ extern void mplayer_put_key( int code ); -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" static void check_events( void ) Index: vo_dga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- vo_dga.c 14 Jun 2004 04:53:02 -0000 1.69 +++ vo_dga.c 28 Oct 2004 01:15:52 -0000 1.70 @@ -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> Index: vo_directfb.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_directfb.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- vo_directfb.c 4 Oct 2003 17:29:04 -0000 1.28 +++ vo_directfb.c 28 Oct 2004 01:15:52 -0000 1.29 @@ -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 @@ extern void mplayer_put_key(int code); -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" static void check_events(void) { Index: vo_directfb2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_directfb2.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- vo_directfb2.c 21 Feb 2004 08:21:42 -0000 1.16 +++ vo_directfb2.c 28 Oct 2004 01:15:52 -0000 1.17 @@ -933,7 +933,7 @@ extern void mplayer_put_key(int code); -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" static void check_events(void) { Index: vo_directx.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- vo_directx.c 27 Oct 2004 17:21:18 -0000 1.40 +++ vo_directx.c 28 Oct 2004 01:15:52 -0000 1.41 @@ -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" Index: vo_dxr3.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- vo_dxr3.c 20 Aug 2004 09:41:13 -0000 1.121 +++ vo_dxr3.c 28 Oct 2004 01:15:52 -0000 1.122 @@ -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" Index: vo_ggi.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_ggi.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- vo_ggi.c 25 Jun 2004 16:58:45 -0000 1.30 +++ vo_ggi.c 28 Oct 2004 01:15:52 -0000 1.31 @@ -533,7 +533,7 @@ } /* EVENT handling */ -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" extern void mplayer_put_key(int code); static void check_events(void) Index: vo_gl2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- vo_gl2.c 17 Oct 2004 13:28:22 -0000 1.54 +++ vo_gl2.c 28 Oct 2004 01:15:52 -0000 1.55 @@ -17,7 +17,7 @@ #include "sub.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif #include <GL/gl.h> Index: vo_quartz.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- vo_quartz.c 27 Oct 2004 21:20:11 -0000 1.30 +++ vo_quartz.c 28 Oct 2004 01:15:52 -0000 1.31 @@ -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 @@ 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)); Index: vo_sdl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- vo_sdl.c 9 Jul 2004 18:59:55 -0000 1.116 +++ vo_sdl.c 28 Oct 2004 01:15:52 -0000 1.117 @@ -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 @@ * 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)) Index: vo_svga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- vo_svga.c 7 Dec 2003 15:08:20 -0000 1.74 +++ vo_svga.c 28 Oct 2004 01:15:52 -0000 1.75 @@ -44,8 +44,8 @@ #include "sub.h" -#include "../mp_msg.h" -//#include "../mp_image.h" +#include "mp_msg.h" +//#include "mp_image.h" #include <assert.h> Index: vo_winvidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_winvidix.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vo_winvidix.c 19 Jul 2004 23:19:50 -0000 1.4 +++ vo_winvidix.c 28 Oct 2004 01:15:52 -0000 1.5 @@ -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); Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- vo_x11.c 20 Aug 2004 09:41:13 -0000 1.140 +++ vo_x11.c 28 Oct 2004 01:15:52 -0000 1.141 @@ -38,16 +38,16 @@ #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 = { Index: vo_xmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- vo_xmga.c 20 Aug 2004 09:41:13 -0000 1.89 +++ vo_xmga.c 28 Oct 2004 01:15:52 -0000 1.90 @@ -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 = { Index: vo_xover.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xover.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- vo_xover.c 20 Aug 2004 09:41:13 -0000 1.9 +++ vo_xover.c 28 Oct 2004 01:15:52 -0000 1.10 @@ -34,7 +34,7 @@ #include "mp_msg.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- vo_xv.c 3 Sep 2004 20:22:22 -0000 1.155 +++ vo_xv.c 28 Oct 2004 01:15:52 -0000 1.156 @@ -37,7 +37,7 @@ #include "aspect.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" +#include "Gui/interface.h" #endif static vo_info_t info = { Index: vo_xvidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- vo_xvidix.c 20 Aug 2004 09:41:13 -0000 1.69 +++ vo_xvidix.c 28 Oct 2004 01:15:52 -0000 1.70 @@ -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 Index: vo_xvmc.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xvmc.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vo_xvmc.c 23 Aug 2004 09:52:25 -0000 1.12 +++ vo_xvmc.c 28 Oct 2004 01:15:52 -0000 1.13 @@ -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 Index: vo_yuv4mpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_yuv4mpeg.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- vo_yuv4mpeg.c 25 Sep 2004 16:10:55 -0000 1.16 +++ vo_yuv4mpeg.c 28 Oct 2004 01:15:52 -0000 1.17 @@ -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 = { Index: vo_zr.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- vo_zr.c 3 Nov 2003 17:38:50 -0000 1.28 +++ vo_zr.c 28 Oct 2004 01:15:52 -0000 1.29 @@ -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" Index: vo_zr2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_zr2.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vo_zr2.c 19 Dec 2003 22:04:13 -0000 1.4 +++ vo_zr2.c 28 Oct 2004 01:15:52 -0000 1.5 @@ -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 = { Index: vosub_vidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- vosub_vidix.c 28 Jan 2004 10:03:40 -0000 1.63 +++ vosub_vidix.c 28 Oct 2004 01:15:52 -0000 1.64 @@ -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 */ Index: vosub_vidix.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vosub_vidix.h 7 Nov 2003 15:12:29 -0000 1.11 +++ vosub_vidix.h 28 Oct 2004 01:15:52 -0000 1.12 @@ -29,7 +29,7 @@ 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); Index: w32_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/w32_common.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- w32_common.c 2 Aug 2004 15:02:35 -0000 1.6 +++ w32_common.c 28 Oct 2004 01:15:52 -0000 1.7 @@ -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" +#include "input/input.h" +#include "input/mouse.h" +#include "mp_msg.h" #include "video_out.h" #include "aspect.h" #include "w32_common.h" Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- x11_common.c 8 Aug 2004 23:22:04 -0000 1.176 +++ x11_common.c 28 Oct 2004 01:15:52 -0000 1.177 @@ -20,7 +20,7 @@ #include "aspect.h" #include "geometry.h" #include "help_mp.h" -#include "../osdep/timer.h" +#include "osdep/timer.h" #include <X11/Xmd.h> #include <X11/Xlib.h> @@ -45,12 +45,12 @@ #include <X11/extensions/Xvlib.h> #endif -#include "../input/input.h" -#include "../input/mouse.h" +#include "input/input.h" +#include "input/mouse.h" #ifdef HAVE_NEW_GUI -#include "../Gui/interface.h" -#include "../mplayer.h" +#include "Gui/interface.h" +#include "mplayer.h" #endif #define WIN_LAYER_ONBOTTOM 2 @@ -523,7 +523,7 @@ mDisplay = NULL; } -#include "../osdep/keycodes.h" +#include "osdep/keycodes.h" #include "wskeys.h" extern void mplayer_put_key(int code);

1 0

CVS: main/libmpdemux Makefile,1.81,1.82
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv9525/libmpdemux Modified Files: Makefile Log Message: Handle "xxx.h" vs "../xxx.h" include paths in a consistent way. Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- Makefile 4 Aug 2004 18:37:51 -0000 1.81 +++ Makefile 28 Oct 2004 01:15:52 -0000 1.82 @@ -34,7 +34,7 @@ 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)

1 0

CVS: main/mp3lib Makefile,1.38,1.39
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/mp3lib In directory mail:/var2/tmp/cvs-serv9525/mp3lib Modified Files: Makefile Log Message: Handle "xxx.h" vs "../xxx.h" include paths in a consistent way. Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/Makefile,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- Makefile 24 Jun 2004 12:52:16 -0000 1.38 +++ Makefile 28 Oct 2004 01:15:53 -0000 1.39 @@ -7,7 +7,7 @@ ifeq ($(TARGET_ARCH_SGI_MIPS),yes) OPTFLAGS := $(OPTFLAGS:-O4=-O0) endif -CFLAGS = $(OPTFLAGS) $(EXTRA_INC) +CFLAGS = -I.. $(OPTFLAGS) $(EXTRA_INC) ifeq ($(TARGET_ARCH_X86),yes) SRCS += decode_i586.c OBJS += decode_i586.o

1 0

CVS: main/Gui Makefile,1.26,1.27
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/Gui In directory mail:/var2/tmp/cvs-serv9525/Gui Modified Files: Makefile Log Message: Handle "xxx.h" vs "../xxx.h" include paths in a consistent way. Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Gui/Makefile,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- Makefile 27 Jun 2004 19:17:24 -0000 1.26 +++ Makefile 28 Oct 2004 01:15:53 -0000 1.27 @@ -4,7 +4,7 @@ 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

1 0

CVS: main Makefile,1.309,1.310
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv9525 Modified Files: Makefile Log Message: Handle "xxx.h" vs "../xxx.h" include paths in a consistent way. Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.309 retrieving revision 1.310 diff -u -r1.309 -r1.310 --- Makefile 26 Oct 2004 06:36:38 -0000 1.309 +++ Makefile 28 Oct 2004 01:15:51 -0000 1.310 @@ -35,7 +35,7 @@ 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)

1 0

CVS: main AUTHORS, 1.124, 1.125 ChangeLog, 1.125, 1.126
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv4688 Modified Files: AUTHORS ChangeLog Log Message: spelling Index: AUTHORS =================================================================== RCS file: /cvsroot/mplayer/main/AUTHORS,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- AUTHORS 20 Oct 2004 21:28:29 -0000 1.124 +++ AUTHORS 28 Oct 2004 01:07:16 -0000 1.125 @@ -576,7 +576,7 @@ Plourde, Nicolas <nicolas.plourde(a)sympatico.ca> * quartz video output driver for Mac OS X - * Darwin vcd/svcd support + * Darwin VCD/SVCD support Poirier, Guillaume <guillaume.poirier(a)ifsic.univ-rennes1.fr> * French documentation translation and synchronization Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- ChangeLog 18 Aug 2004 19:00:04 -0000 1.125 +++ ChangeLog 28 Oct 2004 01:07:16 -0000 1.126 @@ -787,7 +787,7 @@ * some -fixed-vo and vo_preinit fixes, -vo sdl, xmga, mga should work... * various Solaris compatibility fixes (should work out of the box) * mms:// port fixes, tries 1755 if 80 failed - * libavcodec: various ME fixes, B frames fixes, WMV2 slice decoding fixes + * libavcodec: various ME fixes, B-frames fixes, WMV2 slice decoding fixes * -ao alsa9 audio-file playback high CPU usage fixed * libaf updates, 2-pass initialization to get better filter path * better detection of playlists, support for [Reference]-style format @@ -913,7 +913,7 @@ Fixes: * LIRC error message (Error while reading cmd fd X : Success) fixed - * playback of some (streamed?) DivX files starting with non-I frames fixed + * playback of some (streamed?) DivX files starting with non-I-frames fixed * -vo png fixed (removed builtin YV12 support, removed OSD) * some MP3 playback/seek segfaults fixed * VIDIX Mach64 colorkey on PPC fixed @@ -1190,7 +1190,7 @@ pre2: Apr 30, 2002 * hwac3 fixes (try AFMT_AC3 first), big-endian fixes for PCM audio - * 2-pass encoding with libavcodec (-lavcopts vpass=x), B frames support + * 2-pass encoding with libavcodec (-lavcopts vpass=x), B-frames support * faster Ogg seeking (use -forceidx for slow but accurate one) * audio-only with GUI fixed * -rootwin fixed for x11, xv, xmga, xvidix

1 0

CVS: main/TOOLS Makefile,1.2,1.3
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/TOOLS In directory mail:/var2/tmp/cvs-serv740 Modified Files: Makefile Log Message: vivodump compiles now, so it can be added to OBJS. Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 6 Oct 2004 16:46:35 -0000 1.2 +++ Makefile 28 Oct 2004 01:03:52 -0000 1.3 @@ -2,7 +2,8 @@ CFLAGS = -I.. -OBJS = alaw-gen asfinfo avi-fix bios2dump cpuinfo dump_mp4 mem2dump movinfo png2raw subrip fastmemcpybench +OBJS = alaw-gen asfinfo avi-fix bios2dump cpuinfo dump_mp4 mem2dump movinfo \ + png2raw subrip fastmemcpybench vivodump all: $(OBJS)

1 0