From 71670752d0c3ddd7844071b11ab2f1af245869e5 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 10 Jan 2010 12:13:10 +0000 Subject: Disable internal copy of liba52 by default, libavcodec should be an adequate replacement. If there are no complaints we should probably remove it within a few months. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30256 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 10807a6e2a..ab05e9ceed 100755 --- a/configure +++ b/configure @@ -338,7 +338,7 @@ Codecs: --enable-libdca enable libdca support [autodetect] --disable-mp3lib disable builtin mp3lib [autodetect] --disable-liba52 disable liba52 [autodetect] - --disable-liba52-internal disable builtin liba52 [autodetect] + --enable-liba52-internal enable builtin liba52 [disabled] --disable-libmpeg2 disable builtin libmpeg2 [autodetect] --disable-musepack disable musepack support [autodetect] --disable-libopencore_amrnb disable libopencore_amr narrowband [autodetect] @@ -630,7 +630,7 @@ _speex=auto _theora=auto _mp3lib=auto _liba52=auto -_liba52_internal=auto +_liba52_internal=no _libdca=auto _libmpeg2=auto _faad=auto -- cgit v1.2.3 From e51a1598b4615c7a6e0d31c91f917e5ef52006ad Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 10 Jan 2010 13:32:37 +0000 Subject: Quote test arguments that may be empty git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30257 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index ab05e9ceed..e568fec877 100755 --- a/configure +++ b/configure @@ -3111,7 +3111,7 @@ for _ld_tmp in "$_ld_sock" "$_ld_sock -lresolv" ; do cc_check $_ld_tmp && inet_pton=yes && break done if test $inet_pton = yes ; then - test $_ld_tmp && _res_comment="using $_ld_tmp" + test "$_ld_tmp" && _res_comment="using $_ld_tmp" def_inet_pton='#define HAVE_INET_PTON 1' fi echores "$inet_pton" @@ -3130,7 +3130,7 @@ for _ld_tmp in "$_ld_sock" "$_ld_sock -lresolv" ; do cc_check $_ld_tmp && inet_aton=yes && break done if test $inet_aton = yes ; then - test $_ld_tmp && _res_comment="using $_ld_tmp" + test "$_ld_tmp" && _res_comment="using $_ld_tmp" def_inet_aton='#define HAVE_INET_ATON 1' fi echores "$inet_aton" -- cgit v1.2.3 From 534f6aa6b5648c70a2cb4b880fd67c68370e4e86 Mon Sep 17 00:00:00 2001 From: zuxy Date: Sun, 10 Jan 2010 13:52:44 +0000 Subject: Use !isspace() to replace isalnum() to avoid filename mismatch under MBCS locale like those in East Asia where most glyphs are neither alphabetical nor numerical. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30258 b3059339-0415-0410-9bf9-f77b7e298cf2 --- subreader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/subreader.c b/subreader.c index 0776ea2b17..4c1c0a8181 100644 --- a/subreader.c +++ b/subreader.c @@ -1729,18 +1729,18 @@ char * strreplace( char * in,char * what,char * whereof ) static void strcpy_trim(char *d, char *s) { // skip leading whitespace - while (*s && !isalnum(*s)) { + while (*s && isspace(*s)) { s++; } for (;;) { // copy word - while (*s && isalnum(*s)) { + while (*s && !isspace(*s)) { *d = tolower(*s); s++; d++; } if (*s == 0) break; // trim excess whitespace - while (*s && !isalnum(*s)) { + while (*s && isspace(*s)) { s++; } if (*s == 0) break; @@ -1779,7 +1779,7 @@ static void strcpy_get_ext(char *d, char *s) static int whiteonly(char *s) { while (*s) { - if (isalnum(*s)) return 0; + if (!isspace(*s)) return 0; s++; } return 1; -- cgit v1.2.3 From 894acafa51fb23677fa6cb8b1c1ef9986f07dbea Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 10 Jan 2010 13:55:55 +0000 Subject: Prefer libdca over libdts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30259 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index e568fec877..9768a8a406 100755 --- a/configure +++ b/configure @@ -6672,7 +6672,7 @@ if test "$_libdca" = auto ; then #include int main(void) { dts_init(0); return 0; } EOF - for _ld_dca in -ldts -ldca ; do + for _ld_dca in -ldca -ldts ; do cc_check $_ld_dca $_ld_lm && extra_ldflags="$extra_ldflags $_ld_dca" \ && _libdca=yes && break done -- cgit v1.2.3 From 07f7df3208a71e35167e5dfd418d6e304a56d795 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 10 Jan 2010 14:03:10 +0000 Subject: Call XSync after XShmAttach to avoid a possible race-condition with shmctl. Patch from FreeBSD ports. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30260 b3059339-0415-0410-9bf9-f77b7e298cf2 --- gui/wm/ws.c | 1 + 1 file changed, 1 insertion(+) diff --git a/gui/wm/ws.c b/gui/wm/ws.c index 8133baab09..27ca7ae411 100644 --- a/gui/wm/ws.c +++ b/gui/wm/ws.c @@ -1172,6 +1172,7 @@ void wsCreateImage( wsTWindow * win,int Width,int Height ) win->xImage->data=win->Shminfo.shmaddr; win->Shminfo.readOnly=0; XShmAttach( wsDisplay,&win->Shminfo ); + XSync(wsDisplay, False); shmctl( win->Shminfo.shmid,IPC_RMID,0 ); } else -- cgit v1.2.3 From e89c898ac1193374f913bceb2067561cb6fd7425 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 10 Jan 2010 15:31:45 +0000 Subject: Fix RegCloseKey to not return an error on success. Patch by "Steinar H. Gunderson" [sgunderson bigfoot com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30261 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/registry.c b/loader/registry.c index c92321f4e0..37a262270e 100644 --- a/loader/registry.c +++ b/loader/registry.c @@ -385,7 +385,7 @@ long __stdcall RegCloseKey(long key) if(handle==head) head=head->prev; free(handle); - return 1; + return 0; } long __stdcall RegQueryValueExA(long key, const char* value, int* reserved, int* type, int* data, int* count) -- cgit v1.2.3 From cbdb16328cc2dce293a8cd3800c37f9fbbe2c422 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 10 Jan 2010 15:37:14 +0000 Subject: Avoid excessive fflush in dbgprintf if we didn't even print anything. Patch by Steinar H. Gunderson [sgunderson bigfoot com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30262 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/win32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/win32.c b/loader/win32.c index c6c4c7bcec..4a7f02162f 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -208,8 +208,8 @@ static inline void dbgprintf(char* fmt, ...) vprintf(fmt, va); // mp_dbg(MSGT_WIN32, MSGL_DBG3, fmt, va); va_end(va); + fflush(stdout); } - fflush(stdout); } -- cgit v1.2.3 From fff96519eeb241aee5dd98ef2354ecffdbcb2be7 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 10 Jan 2010 16:00:07 +0000 Subject: Only print "using sdl-config" if we actually used it for SDL detection. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30263 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 9768a8a406..c6c7c2efe6 100755 --- a/configure +++ b/configure @@ -5257,6 +5257,7 @@ EOF fi done if test "$_sdl" = no && "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then + _res_comment="using $_sdlconfig" if cygwin ; then _inc_tmp="$($_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/)" _ld_tmp="$($_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/)" @@ -5286,7 +5287,6 @@ if test "$_sdl" = yes ; then libs_mplayer="$libs_mplayer $_ld_tmp" _vomodules="sdl $_vomodules" _aomodules="sdl $_aomodules" - _res_comment="using $_sdlconfig" else def_sdl='#undef CONFIG_SDL' _novomodules="sdl $_novomodules" -- cgit v1.2.3 From 4e50b6df73fd6aa3e426aba796f38b9357ea457b Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 10 Jan 2010 18:22:01 +0000 Subject: Fix OpenGL detection for OpenSolaris where -lXdamage is necessary. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30264 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/configure b/configure index c6c7c2efe6..1ef69d4bc1 100755 --- a/configure +++ b/configure @@ -4945,15 +4945,14 @@ int main(void) { } EOF _gl=no - if cc_check -lGL $_ld_lm ; then - _gl=yes - _gl_x11=yes - libs_mplayer="$libs_mplayer -lGL $_ld_dl" - elif cc_check -lGL $_ld_lm $_ld_pthread ; then - _gl=yes - _gl_x11=yes - libs_mplayer="$libs_mplayer -lGL $_ld_pthread $_ld_dl" - fi + for _ld_tmp in -lGL "-lGL -lXdamage" "-lGL $_ld_pthread" ; do + if cc_check $_ld_tmp $_ld_lm ; then + _gl=yes + _gl_x11=yes + libs_mplayer="$libs_mplayer $_ld_tmp $_ld_dl" + break + fi + done if cc_check -DGL_WIN32 -lopengl32 ; then _gl=yes _gl_win32=yes -- cgit v1.2.3