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

r35935 - trunk/libdvdcss/libdvdcss.c
by iive 09 Mar '13

09 Mar '13

Author: iive Date: Sat Mar 9 21:03:51 2013 New Revision: 35935 Log: Fix build on OS/2. Patch by Dave Yeo. The patch is taken from libdvdcss maillist at videolan.org. Modified: trunk/libdvdcss/libdvdcss.c Modified: trunk/libdvdcss/libdvdcss.c ============================================================================== --- trunk/libdvdcss/libdvdcss.c Sat Mar 9 17:58:26 2013 (r35934) +++ trunk/libdvdcss/libdvdcss.c Sat Mar 9 21:03:51 2013 (r35935) @@ -238,7 +238,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( */ if( psz_cache == NULL || psz_cache[0] == '\0' ) { -#ifdef HAVE_DIRECT_H +#ifdef WIN32 typedef HRESULT( WINAPI *SHGETFOLDERPATH ) ( HWND, int, HANDLE, DWORD, LPTSTR );

1 0

r35934 - trunk/libdvdcss/libdvdcss.c
by iive 09 Mar '13

09 Mar '13

Author: iive Date: Sat Mar 9 17:58:26 2013 New Revision: 35934 Log: Avoid calling FreeLibrary() twice. FreeLibrary() decreases a per-process reference/usage counter. This counter is set to 1 when a library is loaded at startup and increased with each LoadLibrary() call. Calling FreeLibrary() twice could unload the library (that is loaded at startup) and break code that calls its functions directly. In MPlayer this seems to happen with fontconfig package. Modified: trunk/libdvdcss/libdvdcss.c Modified: trunk/libdvdcss/libdvdcss.c ============================================================================== --- trunk/libdvdcss/libdvdcss.c Tue Mar 5 14:38:39 2013 (r35933) +++ trunk/libdvdcss/libdvdcss.c Sat Mar 9 17:58:26 2013 (r35934) @@ -261,11 +261,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( { /* Get the "Application Data" folder for the current user */ if( p_getpath( NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, - NULL, SHGFP_TYPE_CURRENT, psz_home ) == S_OK ) - { - FreeLibrary( p_dll ); - } - else + NULL, SHGFP_TYPE_CURRENT, psz_home ) != S_OK ) { *psz_home = '\0'; }

1 0

r35933 - trunk/etc/codecs.conf
by cehoyos 05 Mar '13

05 Mar '13

Author: cehoyos Date: Tue Mar 5 14:38:39 2013 New Revision: 35933 Log: Support all zmbv colourspaces with current FFmpeg. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Mar 5 02:46:48 2013 (r35932) +++ trunk/etc/codecs.conf Tue Mar 5 14:38:39 2013 (r35933) @@ -132,7 +132,7 @@ videocodec ffzmbv fourcc ZMBV driver ffmpeg dll "zmbv" - out RGB24 + out RGB24,BGR8,BGR15LE,BGR16,BGR32 videocodec ffcdxl info "FFmpeg CDXL"

1 0

r35932 - trunk/etc/codecs.conf
by compn 05 Mar '13

05 Mar '13

Author: compn Date: Tue Mar 5 02:46:48 2013 New Revision: 35932 Log: add FICV binary codec. works on http://samples.ffmpeg.org/V-codecs/ficv.avi dll http://samples.ffmpeg.org/drivers32/new/ficvdec_x86.dll only tested on win2k. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sun Mar 3 11:29:18 2013 (r35931) +++ trunk/etc/codecs.conf Tue Mar 5 02:46:48 2013 (r35932) @@ -3082,6 +3082,15 @@ videocodec webtrain dll "wtvc.dll" out BGR16 flip +videocodec ficvvfw + info "Mirillis Action screen capture codec" + status working + comment "requires msvcm90.dll msvcp90.dll msvcr90.dll" + fourcc FICV + driver vfw + dll "ficvdec_x86.dll" + out BGR32,BGR24,BGR16 flip + videocodec ffkega info "FFmpeg Kega Video" status working

1 0

r35931 - trunk/configure
by cehoyos 03 Mar '13

03 Mar '13

Author: cehoyos Date: Sun Mar 3 11:29:18 2013 New Revision: 35931 Log: Add two config.h defines for an upcoming FFmpeg patch / for consistency. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Mar 2 23:40:40 2013 (r35930) +++ trunk/configure Sun Mar 3 11:29:18 2013 (r35931) @@ -9094,6 +9094,7 @@ $def_truncf #define CONFIG_AUDIO_FRAME_QUEUE 1 #define CONFIG_DCT 1 #define CONFIG_DWT 1 +#define CONFIG_ERROR_RESILIENCE 1 #define CONFIG_FFT 1 #define CONFIG_GOLOMB 1 #define CONFIG_H264CHROMA 1 @@ -9104,6 +9105,7 @@ $def_truncf #define CONFIG_LPC 1 #define CONFIG_LZO 1 #define CONFIG_MDCT 1 +#define CONFIG_MPEGVIDEO 1 #define CONFIG_RDFT 1 #define CONFIG_VIDEODSP 1

1 0

r35930 - trunk/libvo/vo_dxr2.c
by ib 02 Mar '13

02 Mar '13

Author: ib Date: Sat Mar 2 23:40:40 2013 New Revision: 35930 Log: Remove explicit setting of vo_ontop. This is already done by vo_x11_create_vo_window(). (see also r27937) Modified: trunk/libvo/vo_dxr2.c Modified: trunk/libvo/vo_dxr2.c ============================================================================== --- trunk/libvo/vo_dxr2.c Sat Mar 2 23:40:12 2013 (r35929) +++ trunk/libvo/vo_dxr2.c Sat Mar 2 23:40:40 2013 (r35930) @@ -719,8 +719,6 @@ static int config(uint32_t s_width, uint break; } - if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop); - // start playing if(ioctl(dxr2_fd, DXR2_IOC_PLAY, NULL) == 0) { playing = 1;

1 0

r35929 - trunk/libvo/x11_common.c
by ib 02 Mar '13

02 Mar '13

Author: ib Date: Sat Mar 2 23:40:12 2013 New Revision: 35929 Log: Don't modify a -wid window's decoration. vo_x11_decoration() is called by vo_x11_border(), called in case of a VOCTRL_BORDER control. The window's border must not be modified if MPlayer is attached to an existing window. Modified: trunk/libvo/x11_common.c Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Sat Mar 2 10:54:18 2013 (r35928) +++ trunk/libvo/x11_common.c Sat Mar 2 23:40:12 2013 (r35929) @@ -679,7 +679,7 @@ void vo_x11_decoration(Display * vo_Disp int mformat; unsigned long mn, mb; - if (!WinID) + if (WinID >= 0) return; if (vo_fsmode & 8)

1 0

r35928 - trunk/libaf/af_volnorm.c
by reimar 02 Mar '13

02 Mar '13

Author: reimar Date: Sat Mar 2 10:54:18 2013 New Revision: 35928 Log: Fix volnorm filter for float data. Patch by Giorgio Vazzana [mywing81 gmail]. Modified: trunk/libaf/af_volnorm.c Modified: trunk/libaf/af_volnorm.c ============================================================================== --- trunk/libaf/af_volnorm.c Thu Feb 28 12:19:59 2013 (r35927) +++ trunk/libaf/af_volnorm.c Sat Mar 2 10:54:18 2013 (r35928) @@ -51,7 +51,7 @@ // Silence level // FIXME: should be relative to the level of the samples #define SIL_S16 (SHRT_MAX * 0.01) -#define SIL_FLOAT (INT_MAX * 0.01) // FIXME +#define SIL_FLOAT (0.01) // FIXME // smooth must be in ]0.0, 1.0[ #define SMOOTH_MUL 0.06 @@ -106,7 +106,7 @@ static int control(struct af_instance_s* return AF_ERROR; s->method = i-1; s->mid_s16 = ((float)SHRT_MAX) * target; - s->mid_float = ((float)INT_MAX) * target; + s->mid_float = target; return AF_OK; } } @@ -333,7 +333,7 @@ static int af_open(af_instance_t* af){ ((af_volnorm_t*)af->setup)->lastavg = ((float)SHRT_MAX) * DEFAULT_TARGET; ((af_volnorm_t*)af->setup)->idx = 0; ((af_volnorm_t*)af->setup)->mid_s16 = ((float)SHRT_MAX) * DEFAULT_TARGET; - ((af_volnorm_t*)af->setup)->mid_float = ((float)INT_MAX) * DEFAULT_TARGET; + ((af_volnorm_t*)af->setup)->mid_float = DEFAULT_TARGET; for (i = 0; i < NSAMPLES; i++) { ((af_volnorm_t*)af->setup)->mem[i].len = 0;

1 0