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

CVS: main ChangeLog,1.126,1.127
by syncmail＠mplayerhq.hu 08 Nov '04

08 Nov '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv26747 Modified Files: ChangeLog Log Message: preliminary pre6 changes from Reimar Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- ChangeLog 28 Oct 2004 01:07:16 -0000 1.126 +++ ChangeLog 31 Oct 2004 01:29:17 -0000 1.127 @@ -1,5 +1,77 @@ MPlayer (1.0) + pre6: + + Security: + * buffer overflow in mp3lib fixed + * many memleaks fixed + + Ports: + * full x86_64 support + * -rootwin, -panscan support in the Quartz video output driver + * holding key pressed now works in the Quartz video output driver + * VCD support for Darwin + * fix for stdin input and slave mode on MinGW + * support for -rootwin in the DirectX video output driver + * improved monitor selection in the DirectX video output driver + * new DirectSound audio output driver + * support for ZetaOS (mostly working) + + Drivers: + * fixes in the VESA video output driver + * JPEG video output driver suboptions + * improvements for Blinkenlights ;-) + * JACK audio output driver updated to bio2jack API changes + * OpenGL video output driver colorformat fixes (with :manyfmts) + * aspect, panscan, Hardware OSD support in the OpenGL video output driver + * new pnm and md5sum video output drivers + * ALSA audio output driver always uses specified device, even for hwac3 + * support for mixer channels selection in the ALSA audio output driver + + Decoders: + * "experimental" support for 20 and 24 bit LPCM (DVD-Audio) + * libmpeg2 updated to 0.4.0b + * libfaad2 updated to 2.1beta CVS snapshot + * DTS decoding via lavc + + Demuxers: + * fix -nosound and -novideo for NSV + * subtitle switching and language code displaying for Matroska + * support .vp5 file format (AVI variant) + * seeking for audio-only ASF files fixed + * improved MP3 detection + + Streaming: + * -cache-min option + * compilation fix for newer LIVE.COM versions + * make ASF without ECC work + * support for MMS on non-standard port + + FFmpeg/libavcodec: + * new snow video codec + * new sonic audio codec + * reduced resolution decoding + * TSCC support + + Filters: + * software volume control when no hardware support + * high-quality audio resampling with -af lavcresample + * cropdetect rounding parameter + * remaining audio plugins (extrastereo, volnorm) converted to audio filters + + Others: + * -loop and -shuffle now work together + * GUI unified audio options dialog, also for ALSA + * GUI redrawing limited, decreases CPU usage in audio-only case + * x264 encoder support + * better EDL support + * some --disable configure options finally work (mp3lib, liba52, libmpeg2) + * framestepping + * changeable playback speed + * some crashes with binary codecs fixed + * subtitle alignment support for SAMI files + + pre5: "LinuxTag release" July 15, 2004 Name:

5 6

CVS: main/libvo vo_svga.c,1.75,1.76
by syncmail＠mplayerhq.hu 03 Nov '04

03 Nov '04

CVS change done by Atmosfear Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv6009 Modified Files: vo_svga.c Log Message: gcc-4 compile fix: invalid lvalue in assignment Index: vo_svga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- vo_svga.c 28 Oct 2004 01:15:52 -0000 1.75 +++ vo_svga.c 31 Oct 2004 18:05:10 -0000 1.76 @@ -747,7 +747,7 @@ mpi->stride[0] = mode_stride; mpi->planes[0] = PageStore[page].vbase + y_pos*mode_stride + (x_pos*mpi->bpp)/8; - (int)mpi->priv=page; + mpi->priv=(int)page; if(verbose>2) printf("vo_svga: direct render allocated! page=%d\n",page); return(VO_TRUE);

2 1

CVS: main/osdep timer-darwin.c,1.4,1.5
by syncmail＠mplayerhq.hu 02 Nov '04

02 Nov '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/osdep In directory mail:/var2/tmp/cvs-serv1031/osdep Modified Files: timer-darwin.c Log Message: repace call to sleep_accurate to usleep which fix hang while using -cache option on osx Index: timer-darwin.c =================================================================== RCS file: /cvsroot/mplayer/main/osdep/timer-darwin.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- timer-darwin.c 4 Aug 2004 15:48:43 -0000 1.4 +++ timer-darwin.c 27 Oct 2004 18:03:11 -0000 1.5 @@ -32,20 +32,12 @@ const char *timer_name = "Darwin accurate"; -/* the core sleep function, uses floats and is used in MPlayer G2 */ -float sleep_accurate(float time_frame) -{ - uint64_t deadline = time_frame / timebase_ratio + mach_absolute_time(); - - mach_wait_until(deadline); - return (mach_absolute_time() - deadline) * timebase_ratio; -} /* wrapper for MPlayer G1 */ int usec_sleep(int usec_delay) { - return sleep_accurate(usec_delay / 1e6) * 1e6; + return usleep(usec_delay); }

2 1

CVS: main ChangeLog,1.130,1.131
by syncmail＠mplayerhq.hu 31 Oct '04

31 Oct '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv7041 Modified Files: ChangeLog Log Message: osx port related Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- ChangeLog 31 Oct 2004 22:12:45 -0000 1.130 +++ ChangeLog 31 Oct 2004 22:43:41 -0000 1.131 @@ -21,8 +21,9 @@ * full x86_64 support * -rootwin, -panscan support in the quartz video output driver * key repetition and aspect fixed in the quartz video output driver - * right-click menu for quartz video output driver added with zoom options - * VCD support for Darwin + * new "Movie" menu for quartz video output driver added with zoom options & preset + * fs_res sub option let you choose the fullscreen resolution for the quartz video output driver + * VCD support for Darwin (Mac OS X) * fix for stdin input and slave mode on MinGW * support for -rootwin in the DirectX video output driver * improved monitor selection in the DirectX video output driver

1 0

CVS: main ChangeLog,1.129,1.130
by syncmail＠mplayerhq.hu 31 Oct '04

31 Oct '04

CVS change done by Roberto Togni CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv572 Modified Files: ChangeLog Log Message: Typo, found by Nico Sabbi Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- ChangeLog 31 Oct 2004 21:11:42 -0000 1.129 +++ ChangeLog 31 Oct 2004 22:12:45 -0000 1.130 @@ -117,7 +117,7 @@ * adapt MMX/MMX2/SSE/3DNow! optimizations to work on x86_64 * seeking fixes * better and faster audio resampler - * New dc1384 grabbing interface + * New dc1394 grabbing interface * preliminary decoding support for H.264 with CABAC and B-frames * dvr-ms suport in ASF demuxer * MJPEG-B fixes

1 0

CVS: main ChangeLog,1.128,1.129
by syncmail＠mplayerhq.hu 31 Oct '04

31 Oct '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv12700 Modified Files: ChangeLog Log Message: more pre6 changes by Roberto and me Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- ChangeLog 31 Oct 2004 13:50:11 -0000 1.128 +++ ChangeLog 31 Oct 2004 21:11:42 -0000 1.129 @@ -6,10 +6,22 @@ * buffer overflow in mp3lib fixed * many memleaks fixed + DOCS: + * finally all options are documented + * man page completely reviewed for spelling, wording and clarity + * all audio output driver suboptions documented + * all video output driver suboptions documented + * XviD documentation completed + * French man page in sync again + * German man page updated + * new Czech man page translation + * fixes and updates in various places + Ports: * full x86_64 support - * -rootwin, -panscan support in the Quartz video output driver - * holding key pressed now works in the Quartz video output driver + * -rootwin, -panscan support in the quartz video output driver + * key repetition and aspect fixed in the quartz video output driver + * right-click menu for quartz video output driver added with zoom options * VCD support for Darwin * fix for stdin input and slave mode on MinGW * support for -rootwin in the DirectX video output driver @@ -24,30 +36,32 @@ * JACK audio output driver updated to bio2jack API changes * OpenGL video output driver colorformat fixes (with :manyfmts) * aspect, panscan, Hardware OSD support in the OpenGL video output driver - * new pnm and md5sum video output drivers + * new pnm and md5sum video output drivers, replacing pgm and md5 + * alsa9 and alsa1x replaced by alsa audio output driver * ALSA audio output driver always uses specified device, even for hwac3 - * support for mixer channels selection in the ALSA audio output driver + * support for mixer channel selection in the ALSA audio output driver + * jpeg video output driver now supports output to multiple directories Decoders: * "experimental" support for 20 and 24 bit LPCM (DVD-Audio) * libmpeg2 updated to 0.4.0b * libfaad2 updated to 2.1beta CVS snapshot * DTS decoding via lavc - * Windows Media Audio 9 Voice support via binary codec - * Windows Media Video 9 Advanced support via binary codec - * Windows Media Screen Codec 2 support via binary codec - * Windows Media Picture Codec support via binary codec - * VDOWave video support via binary codec + * Windows Media Audio 9 Voice support via binary DLL + * Windows Media Video 9 Advanced support via binary DLL + * Windows Media Screen Codec 2 support via binary DLL + * Windows Media Picture Codec support via binary DLL + * VDOWave video support via binary DLL * Miro VideoXL video support via lavc - * Creative ADPCM audio support via lavc or binary codec - * IBM Ultimoion video support via lavc - * Micronas Speech codec support via binary codec - * H.261 video support via lavc - * Techsmith Camtasia Screen Codec video support via lavc + * Creative ADPCM audio support via lavc or binary DLL + * IBM Ultimotion video support via lavc + * Micronas Speech codec support via binary DLL + * H.261 video codec support via lavc + * TechSmith Camtasia video codec support via lavc * sonic audio codec support via lavc * snow video codec support via lavc * QuickDraw video support via lavc - * Cinepak, CYUV and RoQ Audio/Video moved to FFmpeg + * Cinepak, CYUV and RoQ audio/video moved to FFmpeg Demuxers: * fix -nosound and -novideo for NSV @@ -57,24 +71,65 @@ * improved MP3 detection * AVC in .mp4 files * raw H.261 files via lavf + * improved seeking precision in MPEG files + * better subtitle language code handling for MKV files Streaming: - * -cache-min option + * -cache-min and -cache-prefill options added * compilation fix for newer LIVE.COM versions * make ASF without ECC work * support for MMS on non-standard port + * EOF detected in Real RTSP streams FFmpeg/libavcodec: - * new snow video codec - * new sonic audio codec * reduced resolution decoding - * TSCC support + * new experimental wavelet-based snow video codec + * new sonic audio codec + * TechSmith Camtasia video decoder + * IBM Ultimotion video decoder + * QuickDraw video decoder + * Creative ADPCM decoder + * Miro VideoXL decoder + * Sierra online audio files demuxer and decoder + * Electronic Arts Game Multimedia format demuxer + * H.261 fixes, H.261 encoder + * fix VIS accelerated code + * DTS support via libdts + * many DV fixes, seek in raw DV files + * support AAC in MOV files + * RV10 fixes + * AVI demuxer cleanup, palette change support + * iTunes metadata support + * HuffYUV fixes (endianness, RGB32 predictor, median encoding, interlacing) + * SSE optimizations for 4x4 compare function + * epzs motion search enhancements + * quad tree based motion compensation + * MPEG4 qpel MMX2/3DNow! optimizations + * H.264: lot of fixes and MMX2/3DNow! optimizations + * AVC1 (H.264 without sync word in .mp4 files) support + * H.264 qpel motion compensation + * Indeo3 grayscale decoding + * preliminary Truemotion 24 bit decoder + * avizlib encoder fixed + * trellis quantization support in H.263 + * DCT optimizations + * AltiVec support on AmigaOS4 + * adapt MMX/MMX2/SSE/3DNow! optimizations to work on x86_64 + * seeking fixes + * better and faster audio resampler + * New dc1384 grabbing interface + * preliminary decoding support for H.264 with CABAC and B-frames + * dvr-ms suport in ASF demuxer + * MJPEG-B fixes + * range coder (arithmetic entropy coder) used by snow and ffv1 + * ffv1 enhancements: signed golomb, range codes + * as usual, lots of bug fixes and optimizations Filters: * software volume control when no hardware support * high-quality audio resampling with -af lavcresample * cropdetect rounding parameter - * remaining audio plugins (extrastereo, volnorm) converted to audio filters + * missing audio plugins (extrastereo, volnorm) converted to audio filters Others: * -loop and -shuffle now work together @@ -87,6 +142,19 @@ * changeable playback speed * some crashes with binary codecs fixed * subtitle alignment support for SAMI files + * MEncoder can encode MP2 with libtoolame + * MPlayer -af help + * also support Windows path separator '\' + * lavc "turbo mode" to speed up 2-pass encoding + * XviD encoder frontend updated to XviD 1.1 + API 4.1 + * flush remainig frames at end of encoding process + * VIDIX Cyberblade TV-out fixed + * VIDIX I420 support for Cyberblade and mga + * VIDIX Radeon support on big-endian systems, other Radeon fixes + * CLE266 VIDIX driver + * -jpeg removed in favor of -vo jpeg suboptions + * FriBiDi fixes for comma handling in Hebrew subtitles + * -crash-debug option to attach gdb automatically after crashes pre5: "LinuxTag release" July 15, 2004

1 0

CVS: main/libao2 ao_sdl.c,1.35,1.36
by syncmail＠mplayerhq.hu 31 Oct '04

31 Oct '04

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libao2 In directory mail:/var2/tmp/cvs-serv15052/libao2 Modified Files: ao_sdl.c Log Message: Different buffering scheme, avoiding possible races (SDL is using threads!). Index: ao_sdl.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_sdl.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ao_sdl.c 18 Sep 2004 20:31:27 -0000 1.35 +++ ao_sdl.c 31 Oct 2004 21:02:47 -0000 1.36 @@ -46,68 +46,78 @@ #define SAMPLESIZE 1024 #endif -// General purpose Ring-buffering routines - -#define BUFFSIZE 4096 -#define NUM_BUFS 8 - -static unsigned char *buffer[NUM_BUFS]; - -static unsigned int buf_read=0; -static unsigned int buf_write=0; -static unsigned int buf_read_pos=0; -static unsigned int buf_write_pos=0; +#define CHUNK_SIZE 4096 +#define NUM_CHUNKS 8 +// This type of ring buffer may never fill up completely, at least +// one byte must always be unused. +// For performance reasons (alignment etc.) one whole chunk always stays +// empty, not only one byte. +#define BUFFSIZE ((NUM_CHUNKS + 1) * CHUNK_SIZE) + +static unsigned char *buffer; + +// may only be modified by SDL's playback thread or while it is stopped +static volatile int read_pos; +// may only be modified by mplayer's thread +static volatile int write_pos; #ifdef USE_SDL_INTERNAL_MIXER static unsigned char volume=SDL_MIX_MAXVOLUME; #endif -static int full_buffers=0; -static int buffered_bytes=0; +// may only be called by mplayer's thread +// return value may change between immediately following two calls, +// and the real number of free bytes might be larger! +static int buf_free() { + int free = read_pos - write_pos - CHUNK_SIZE; + if (free < 0) free += BUFFSIZE; + return free; +} + +// may only be called by SDL's playback thread +// return value may change between immediately following two calls, +// and the real number of buffered bytes might be larger! +static int buf_used() { + int used = write_pos - read_pos; + if (used < 0) used += BUFFSIZE; + return used; +} static int write_buffer(unsigned char* data,int len){ - int len2=0; - int x; - while(len>0){ - if(full_buffers==NUM_BUFS) break; - x=BUFFSIZE-buf_write_pos; - if(x>len) x=len; - memcpy(buffer[buf_write]+buf_write_pos,data+len2,x); - if (buf_write_pos==0) - ++full_buffers; - len2+=x; len-=x; - buffered_bytes+=x; buf_write_pos+=x; - if(buf_write_pos>=BUFFSIZE){ - // block is full, find next! - buf_write=(buf_write+1)%NUM_BUFS; - buf_write_pos=0; - } + int first_len = BUFFSIZE - write_pos; + int free = buf_free(); + if (len > free) len = free; + if (first_len > len) first_len = len; + // till end of buffer + memcpy (&buffer[write_pos], data, first_len); + if (len > first_len) { // we have to wrap around + // remaining part from beginning of buffer + memcpy (buffer, &data[first_len], len - first_len); } - return len2; + write_pos = (write_pos + len) % BUFFSIZE; + return len; } static int read_buffer(unsigned char* data,int len){ - int len2=0; - int x; - while(len>0){ - if(buffered_bytes==0) break; // no more data buffered! - x=BUFFSIZE-buf_read_pos; - if(x>len) x=len; - if (x>buffered_bytes) x=buffered_bytes; + int first_len = BUFFSIZE - read_pos; + int buffered = buf_used(); + if (len > buffered) len = buffered; + if (first_len > len) first_len = len; + // till end of buffer #ifdef USE_SDL_INTERNAL_MIXER - SDL_MixAudio(data+len2,buffer[buf_read]+buf_read_pos,x,volume); + SDL_MixAudio (data, &buffer[read_pos], first_len, volume); #else - memcpy(data+len2,buffer[buf_read]+buf_read_pos,x); + memcpy (data, &buffer[read_pos], first_len); +#endif + if (len > first_len) { // we have to wrap around + // remaining part from beginning of buffer +#ifdef USE_SDL_INTERNAL_MIXER + SDL_MixAudio (&data[first_len], buffer, len - first_len, volume); +#else + memcpy (&data[first_len], buffer, len - first_len); #endif - len2+=x; len-=x; - buffered_bytes-=x; buf_read_pos+=x; - if(buf_read_pos>=BUFFSIZE){ - // block is empty, find next! - buf_read=(buf_read+1)%NUM_BUFS; - --full_buffers; - buf_read_pos=0; - } } - return len2; + read_pos = (read_pos + len) % BUFFSIZE; + return len; } // end ring buffer stuff @@ -168,9 +178,8 @@ /* SDL Audio Specifications */ SDL_AudioSpec aspec, obtained; - int i; /* Allocate ring-buffer memory */ - for(i=0;i<NUM_BUFS;i++) buffer[i]=(unsigned char *) malloc(BUFFSIZE); + buffer = (unsigned char *) malloc(BUFFSIZE); mp_msg(MSGT_AO,MSGL_INFO,MSGTR_AO_SDL_INFO, rate, (channels > 1) ? "Stereo" : "Mono", audio_out_format_name(format)); @@ -272,6 +281,7 @@ mp_msg(MSGT_AO,MSGL_V,"SDL: buf size = %d\n",obtained.size); ao_data.buffersize=obtained.size; + reset(); /* unsilence audio, if callback is ready */ SDL_PauseAudio(0); @@ -281,7 +291,7 @@ // close audio device static void uninit(int immed){ mp_msg(MSGT_AO,MSGL_V,"SDL: Audio Subsystem shutting down!\n"); - while(buffered_bytes > 0) + while(buf_free() < BUFFSIZE - CHUNK_SIZE) usec_sleep(50000); SDL_CloseAudio(); SDL_QuitSubSystem(SDL_INIT_AUDIO); @@ -292,15 +302,11 @@ //printf("SDL: reset called!\n"); + SDL_PauseAudio(1); /* Reset ring-buffer state */ - buf_read=0; - buf_write=0; - buf_read_pos=0; - buf_write_pos=0; - - full_buffers=0; - buffered_bytes=0; - + read_pos = 0; + write_pos = 0; + SDL_PauseAudio(0); } // stop playing, keep buffers (for pause) @@ -322,7 +328,7 @@ // return: how many bytes can be played without blocking static int get_space(){ - return NUM_BUFS*BUFFSIZE - buffered_bytes; + return buf_free(); } // plays 'len' bytes of 'data' @@ -348,7 +354,8 @@ // return: delay in seconds between first and last sample in buffer static float get_delay(){ - return (float)(buffered_bytes + ao_data.buffersize)/(float)ao_data.bps; + int buffered = BUFFSIZE - CHUNK_SIZE - buf_free(); // could be less + return (float)(buffered + ao_data.buffersize)/(float)ao_data.bps; }

1 0

CVS: main configure,1.928,1.929
by syncmail＠mplayerhq.hu 31 Oct '04

31 Oct '04

CVS change done by Sascha Sommer CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv8948 Modified Files: configure Log Message: some people have GREP_OPTIONS set to --ignore-case what makes it a bit dangerous to rely on the string MPlayer for the big endian check Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.928 retrieving revision 1.929 diff -u -r1.928 -r1.929 --- configure 30 Oct 2004 09:31:33 -0000 1.928 +++ configure 31 Oct 2004 18:19:28 -0000 1.929 @@ -5949,14 +5949,15 @@ echocheck "byte order" if test "$_big_endian" = auto ; then cat > $TMPC <<EOF -short asci_name[] = { (('M'<<8)|'P'),(('l'<<8)|'a'),(('y'<<8)|'e'),(('r'<<8)|0)}; +short ascii_name[] = { (('M'<<8)|'P'),(('l'<<8)|'a'),(('y'<<8)|'e'),(('r'<<8)|'B'), + (('i'<<8)|'g'),(('E'<<8)|'n'),(('d'<<8)|'i'),(('a'<<8)|'n'),0}; int main(){ - char* s = (char*)asci_name; + char* s = (char*)ascii_name; return 0; } EOF if cc_check ; then - if test `grep -l MPlayer $TMPO` ; then + if test `grep -l MPlayerBigEndian $TMPO` ; then _big_endian=yes else _big_endian=no

1 0

CVS: main/libvo x11_common.c,1.177,1.178
by syncmail＠mplayerhq.hu 31 Oct '04

31 Oct '04

CVS change done by Atmosfear Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv12023 Modified Files: x11_common.c Log Message: Fix erroneus extern declarations, fix wrong signedness of some vars Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- x11_common.c 28 Oct 2004 01:15:52 -0000 1.177 +++ x11_common.c 31 Oct 2004 18:01:14 -0000 1.178 @@ -165,7 +165,7 @@ Pixmap bm_no; XColor black, dummy; Colormap colormap; - static unsigned char bm_no_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + static char bm_no_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; if (WinID == 0) return; // do not hide, if we're playing at rootwin @@ -851,8 +851,6 @@ long state; } MotifWmHints; -extern MotifWmHints vo_MotifWmHints; -extern Atom vo_MotifHints; extern int vo_depthonscreen; extern int vo_screenwidth; extern int vo_screenheight; @@ -1777,8 +1775,8 @@ void vo_vm_switch(uint32_t X, uint32_t Y, int *modeline_width, int *modeline_height) { - unsigned int vm_event, vm_error; - unsigned int vm_ver, vm_rev; + int vm_event, vm_error; + int vm_ver, vm_rev; int i, j, have_vm = 0; int modecount;

1 0

CVS: main/loader ext.c,1.11,1.12
by syncmail＠mplayerhq.hu 31 Oct '04

31 Oct '04

CVS change done by Atmosfear Update of /cvsroot/mplayer/main/loader In directory mail:/var2/tmp/cvs-serv24191/loader Modified Files: ext.c Log Message: gcc-4.0.0-20041024 compile-fix Index: ext.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/ext.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ext.c 10 Sep 2004 22:22:02 -0000 1.11 +++ ext.c 31 Oct 2004 15:40:47 -0000 1.12 @@ -472,7 +472,7 @@ if (type&MEM_RESERVE && (unsigned)address&0xffff) { size += (unsigned)address&0xffff; - (unsigned)address &= ~0xffff; + address = (unsigned)address&~0xffff; } pgsz = sysconf(_SC_PAGESIZE); if (type&MEM_COMMIT && (unsigned)address%pgsz) {

1 0