Merge svn changes up to r30663

Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c
This commit is contained in:
Uoti Urpala
2010-03-10 00:13:11 +02:00
29 changed files with 231 additions and 116 deletions

View File

@@ -130,7 +130,7 @@ static int open_f(stream_t *stream,int mode, void* opts, int* file_format) {
return STREAM_ERROR;
}
#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__)
#if HAVE_DOS_PATHS
// extract '/' from '/x:/path'
if( filename[ 0 ] == '/' && filename[ 1 ] && filename[ 2 ] == ':' )
filename++;