July 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r36356 - trunk/stream/tcp.c
by al 11 Jul '13

11 Jul '13

Author: al Date: Fri Jul 12 00:08:33 2013 New Revision: 36356 Log: stream/tcp: Check that host object has the right AF before connect Avoid trying bogus IPv6 adresses on systems that only have gethostbyname function. Currently we would copy the IPv4 address into the first part of the IPv6 and then try to connect to that. The connection attempt can take a long time. Tested-by: Erik Auerswald >auerswal unix-ag uni-kl de< Patch-by: >aplattner nvidia com< Modified: trunk/stream/tcp.c Modified: trunk/stream/tcp.c ============================================================================== --- trunk/stream/tcp.c Thu Jul 11 17:27:32 2013 (r36355) +++ trunk/stream/tcp.c Fri Jul 12 00:08:33 2013 (r36356) @@ -160,6 +160,8 @@ connect2Server_with_af(char *host, int p return TCP_ERROR_FATAL; } + if (af != hp->h_addrtype) return TCP_ERROR_FATAL; + memcpy( our_s_addr, hp->h_addr_list[0], hp->h_length ); } #if HAVE_WINSOCK2_H

1 0

r36355 - trunk/gui/wm/ws.c
by ib 11 Jul '13

11 Jul '13

Author: ib Date: Thu Jul 11 17:27:32 2013 New Revision: 36355 Log: Prettify debug message. Modified: trunk/gui/wm/ws.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Thu Jul 11 17:20:01 2013 (r36354) +++ trunk/gui/wm/ws.c Thu Jul 11 17:27:32 2013 (r36355) @@ -929,7 +929,7 @@ void wsWindowCreate(wsWindow *win, int x win->DrawHandler = NULL; win->MouseHandler = NULL; win->KeyHandler = NULL; - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] window is created. ( %s ).\n", label); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] window successfully created: %s\n", label); } void wsWindowDestroy(wsWindow *win)

1 0

r36354 - trunk/gui/wm/ws.c
by ib 11 Jul '13

11 Jul '13

Author: ib Date: Thu Jul 11 17:20:01 2013 New Revision: 36354 Log: Add a debug message on the visual. Print the ID of the matching visual. Modified: trunk/gui/wm/ws.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Fri Jul 5 20:16:54 2013 (r36353) +++ trunk/gui/wm/ws.c Thu Jul 11 17:20:01 2013 (r36354) @@ -831,6 +831,8 @@ void wsWindowCreate(wsWindow *win, int x XMatchVisualInfo(wsDisplay, wsScreen, depth, TrueColor, &win->VisualInfo); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] visual: ID %#lx\n", win->VisualInfo.visualid); + /* --- */ win->AtomLeaderClient = XInternAtom(wsDisplay, "WM_CLIENT_LEADER", False); win->AtomDeleteWindow = XInternAtom(wsDisplay, "WM_DELETE_WINDOW", False);

1 0

r36353 - trunk/configure
by reimar 05 Jul '13

05 Jul '13

Author: reimar Date: Fri Jul 5 20:16:54 2013 New Revision: 36353 Log: Remove AV_ prefix from define for internal config.h header. This avoids a couple of warnings. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Jul 5 20:09:12 2013 (r36352) +++ trunk/configure Fri Jul 5 20:16:54 2013 (r36353) @@ -9068,7 +9068,7 @@ $def_sinf $def_trunc $def_truncf -#define AV_HAVE_INCOMPATIBLE_LIBAV_ABI 0 +#define HAVE_INCOMPATIBLE_LIBAV_ABI 0 #define CONFIG_AUDIO_FLOAT 0 #define CONFIG_AVCODEC 1 #define CONFIG_AVSERVER 0

1 0

r36352 - trunk/configure
by reimar 05 Jul '13

05 Jul '13

Author: reimar Date: Fri Jul 5 20:09:12 2013 New Revision: 36352 Log: Disable G2M decoder if zlib is not available. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Jul 5 19:47:46 2013 (r36351) +++ trunk/configure Fri Jul 5 20:09:12 2013 (r36352) @@ -6313,7 +6313,7 @@ if test "$_zlib" = yes ; then mplayer_encoders="$mplayer_encoders PNG_ENCODER" else def_zlib='#define CONFIG_ZLIB 0' - libavdecoders=$(filter_out_component decoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR TSCC ZEROCODEC') + libavdecoders=$(filter_out_component decoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M TSCC ZEROCODEC') libavencoders=$(filter_out_component encoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB') fi echores "$_zlib"

1 0

r36351 - trunk/configure
by reimar 05 Jul '13

05 Jul '13

Author: reimar Date: Fri Jul 5 19:47:46 2013 New Revision: 36351 Log: Follow renaming of AV_HAVE_INCOMPATIBLE_FORK_ABI define. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Jun 19 16:40:58 2013 (r36350) +++ trunk/configure Fri Jul 5 19:47:46 2013 (r36351) @@ -9068,7 +9068,7 @@ $def_sinf $def_trunc $def_truncf -#define AV_HAVE_INCOMPATIBLE_FORK_ABI 0 +#define AV_HAVE_INCOMPATIBLE_LIBAV_ABI 0 #define CONFIG_AUDIO_FLOAT 0 #define CONFIG_AVCODEC 1 #define CONFIG_AVSERVER 0 @@ -9177,7 +9177,7 @@ cat > "$TMPH" << EOF #define AVUTIL_AVCONFIG_H $def_av_bigendian $def_av_fast_unaligned -#define AV_HAVE_INCOMPATIBLE_FORK_ABI 0 +#define AV_HAVE_INCOMPATIBLE_LIBAV_ABI 0 #endif /* AVUTIL_AVCONFIG_H */ EOF

1 0