March 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r23524 - trunk/etc/codecs.conf
by compn 10 Jun '10

10 Jun '10

Author: compn Date: Sat Jun 9 00:59:04 2007 New Revision: 23524 Log: add mmes fourcc for mpeg2 in avi files Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Sat Jun 9 00:59:04 2007 @@ -58,6 +58,7 @@ videocodec mpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -85,6 +86,7 @@ videocodec ffmpeg2 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -104,6 +106,7 @@ videocodec ffmpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -122,6 +125,7 @@ videocodec ffmpeg12mc fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2

4 5

r29721 - trunk/libvo/gl_common.c
by reimar 24 May '10

24 May '10

Author: reimar Date: Sun Sep 27 16:24:15 2009 New Revision: 29721 Log: Also check GLX client and server strings for extensions Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sat Sep 26 23:22:01 2009 (r29720) +++ trunk/libvo/gl_common.c Sun Sep 27 16:24:15 2009 (r29721) @@ -1563,6 +1563,21 @@ static XVisualInfo *getWindowVisualInfo( return XGetVisualInfo(mDisplay, VisualIDMask, &vinfo_template, &tmp); } +static void appendstr(char **dst, const char *str) +{ + int newsize; + char *newstr; + if (!str) + return; + newsize = strlen(*dst) + 1 + strlen(str) + 1; + newstr = realloc(*dst, newsize); + if (!newstr) + return; + *dst = newstr; + strcat(*dst, " "); + strcat(*dst, str); +} + /** * \brief Changes the window in which video is displayed. * If possible only transfers the context to the new window, otherwise @@ -1619,6 +1634,7 @@ int setGlWindow(XVisualInfo **vinfo, GLX if (!keep_context) { void *(*getProcAddress)(const GLubyte *); const char *(*glXExtStr)(Display *, int); + char *glxstr = strdup(""); if (*context) glXDestroyContext(mDisplay, *context); *context = new_context; @@ -1631,8 +1647,17 @@ int setGlWindow(XVisualInfo **vinfo, GLX if (!getProcAddress) getProcAddress = (void *)getdladdr; glXExtStr = getdladdr("glXQueryExtensionsString"); - getFunctions(getProcAddress, !glXExtStr ? NULL : - glXExtStr(mDisplay, DefaultScreen(mDisplay))); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, DefaultScreen(mDisplay))); + glXExtStr = getdladdr("glXGetClientString"); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, GLX_EXTENSIONS)); + glXExtStr = getdladdr("glXGetServerString"); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, GLX_EXTENSIONS)); + + getFunctions(getProcAddress, glxstr); + free(glxstr); // and inform that reinit is neccessary return SET_WINDOW_REINIT;

4 6

r30728 - trunk/libvo/fastmemcpy.h
by diego 11 May '10

11 May '10

Author: diego Date: Thu Feb 25 14:20:56 2010 New Revision: 30728 Log: Unconditionally declare fast_memcpy() and mem2agpcpy(). This fixes the following warnings on non-x86 systems: libvo/aclib.c:162: warning: no previous prototype for 'fast_memcpy' libvo/aclib.c:196: warning: no previous prototype for 'mem2agpcpy' Modified: trunk/libvo/fastmemcpy.h Modified: trunk/libvo/fastmemcpy.h ============================================================================== --- trunk/libvo/fastmemcpy.h Thu Feb 25 10:09:57 2010 (r30727) +++ trunk/libvo/fastmemcpy.h Thu Feb 25 14:20:56 2010 (r30728) @@ -22,14 +22,12 @@ #include "config.h" #include <inttypes.h> #include <string.h> - -#if defined(CONFIG_FASTMEMCPY) && (HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW /* || HAVE_SSE || HAVE_SSE2 */) #include <stddef.h> void * fast_memcpy(void * to, const void * from, size_t len); void * mem2agpcpy(void * to, const void * from, size_t len); -#else +#if ! defined(CONFIG_FASTMEMCPY) && ! (HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW /* || HAVE_SSE || HAVE_SSE2 */) #define mem2agpcpy(a,b,c) memcpy(a,b,c) #define fast_memcpy(a,b,c) memcpy(a,b,c) #endif

3 2

r30980 - trunk/stream/http.c
by reimar 02 Apr '10

02 Apr '10

Author: reimar Date: Wed Mar 31 21:42:15 2010 New Revision: 30980 Log: Sanitize ICY metadata a bit before printing it. Modified: trunk/stream/http.c Modified: trunk/stream/http.c ============================================================================== --- trunk/stream/http.c Wed Mar 31 20:45:00 2010 (r30979) +++ trunk/stream/http.c Wed Mar 31 21:42:15 2010 (r30980) @@ -124,8 +124,13 @@ static void scast_meta_read(int fd, stre my_read(fd, &tmp, 1, sc); metalen = tmp * 16; if (metalen > 0) { + int i; char *info = malloc(metalen + 1); unsigned nlen = my_read(fd, info, metalen, sc); + // avoid breaking the user's terminal too much + if (nlen > 256) nlen = 256; + for (i = 0; i < nlen; i++) + if (info[i] && info[i] < 32) info[i] = '?'; info[nlen] = 0; mp_msg(MSGT_DEMUXER, MSGL_INFO, "\nICY Info: %s\n", info); free(info);

3 2

r30979 - trunk/libmpdemux/demux_avi.c
by reimar 31 Mar '10

31 Mar '10

Author: reimar Date: Wed Mar 31 20:45:00 2010 New Revision: 30979 Log: Make audio switching with AVI demuxer chose the first audio stream if audio is disabled instead of ignoring the request. Modified: trunk/libmpdemux/demux_avi.c Modified: trunk/libmpdemux/demux_avi.c ============================================================================== --- trunk/libmpdemux/demux_avi.c Wed Mar 31 19:00:33 2010 (r30978) +++ trunk/libmpdemux/demux_avi.c Wed Mar 31 20:45:00 2010 (r30979) @@ -801,7 +801,7 @@ static int demux_avi_control(demuxer_t * int maxid = FFMIN(100, audio ? MAX_A_STREAMS : MAX_V_STREAMS); int chunkid; if (ds->id < -1) - return DEMUXER_CTRL_NOTIMPL; + ds->id = -1; if (*(int *)arg >= 0) ds->id = *(int *)arg;

1 0

r30977 - trunk/etc/codecs.conf
by attila 31 Mar '10

31 Mar '10

Author: attila Date: Wed Mar 31 08:33:08 2010 New Revision: 30977 Log: rename eatgv -> ffeatgv, lpcm -> fflpcm for consitently naming all ffmpeg codecs requested by compn Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sun Mar 28 21:02:58 2010 (r30976) +++ trunk/etc/codecs.conf Wed Mar 31 08:33:08 2010 (r30977) @@ -3045,7 +3045,7 @@ videocodec ffc93 dll c93 out BGR8 -videocodec eatgv +videocodec ffeatgv info "FFmpeg Electronic Arts TGV" status working fourcc fVGT @@ -4243,7 +4243,7 @@ audiocodec dvdpcm format 0x10001 driver dvdpcm -audiocodec lpcm +audiocodec fflpcm info "Bluray LPCM" status working fourcc BPCM ; internal MPlayer FourCC

1 0

r30976 - trunk/configure
by diego 28 Mar '10

28 Mar '10

Author: diego Date: Sun Mar 28 21:02:58 2010 New Revision: 30976 Log: Add HAVE_STRERROR_R definition for FFmpeg to config.h. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Mar 28 18:58:27 2010 (r30975) +++ trunk/configure Sun Mar 28 21:02:58 2010 (r30976) @@ -9213,6 +9213,7 @@ $def_yasm #define HAVE_LDBRX 0 #define HAVE_POLL_H 1 #define HAVE_PPC4XX 0 +#define HAVE_STRERROR_R 0 #define HAVE_SYS_SELECT_H 0 #define HAVE_VFP_ARGS 1 #define HAVE_VIRTUALALLOC 0

1 0

r30975 - trunk/libvo/vo_xvmc.c
by diego 28 Mar '10

28 Mar '10

Author: diego Date: Sun Mar 28 18:58:27 2010 New Revision: 30975 Log: Use (void) instead of () to indicate a parameterless function, fixes: libvo/vo_xvmc.c:123: warning: function declaration isn't a prototype Modified: trunk/libvo/vo_xvmc.c Modified: trunk/libvo/vo_xvmc.c ============================================================================== --- trunk/libvo/vo_xvmc.c Sun Mar 28 18:49:23 2010 (r30974) +++ trunk/libvo/vo_xvmc.c Sun Mar 28 18:58:27 2010 (r30975) @@ -120,7 +120,7 @@ static void init_osd_yuv_pal(void); static const struct{ int id;//id as xvimages or as mplayer RGB|{8,15,16,24,32} - void (* init_func_ptr)(); + void (* init_func_ptr)(void); void (* draw_func_ptr)(); void (* clear_func_ptr)(); } osd_render[]={

1 0

r30974 - trunk/configure
by diego 28 Mar '10

28 Mar '10

Author: diego Date: Sun Mar 28 18:49:23 2010 New Revision: 30974 Log: Add definition of CONFIG_LIBRTMP to config.h for FFmpeg. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Mar 28 18:31:17 2010 (r30973) +++ trunk/configure Sun Mar 28 18:49:23 2010 (r30974) @@ -9192,6 +9192,7 @@ $def_yasm #define CONFIG_FFSERVER 0 #define CONFIG_GPL 1 #define CONFIG_GRAY 0 +#define CONFIG_LIBRTMP 0 #define CONFIG_LIBVORBIS 0 #define CONFIG_POWERPC_PERF 0 #define CONFIG_SMALL 0

1 0

r30973 - trunk/configure
by reimar 28 Mar '10

28 Mar '10

Author: reimar Date: Sun Mar 28 18:31:17 2010 New Revision: 30973 Log: Fix compilation after librtmp support in FFmpeg. Should be replaced by a proper configure check for librtmp later. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Mar 28 01:08:28 2010 (r30972) +++ trunk/configure Sun Mar 28 18:31:17 2010 (r30973) @@ -8704,6 +8704,7 @@ CONFIG_RDFT=yes $mak_hardcoded_tables $mak_libavcodec_mpegaudio_hp +!CONFIG_LIBRTMP=yes CONFIG_BZLIB=$bzlib CONFIG_ENCODERS=yes

1 0