October 2003 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/DOCS/tech mpcf.txt,1.34,1.35
by Alex Beregszaszi 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var/tmp.root/cvs-serv8989 Modified Files: mpcf.txt Log Message: codec_specific_data_size Index: mpcf.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/mpcf.txt,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- mpcf.txt 15 Sep 2003 20:22:27 -0000 1.34 +++ mpcf.txt 2 Oct 2003 22:16:20 -0000 1.35 @@ -109,6 +109,7 @@ for(;;){ codec_specific_data_type v if(codec_specific_data_type==0) break; + codec_specific_data_size v codec_specific_data b }

3 2

CVS: main/libmpdemux demux_mkv.cpp,1.34,1.35
by Moritz Bunkus CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv5606 Modified Files: demux_mkv.cpp Log Message: Backwards compatibility fix for old SSA CodecIDs. Index: demux_mkv.cpp =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- demux_mkv.cpp 22 Sep 2003 13:53:29 -0000 1.34 +++ demux_mkv.cpp 2 Oct 2003 19:02:28 -0000 1.35 @@ -1900,7 +1900,8 @@ if (track) { if (strcmp(track->codec_id, MKV_S_TEXTASCII) && strcmp(track->codec_id, MKV_S_TEXTUTF8) && - strcmp(track->codec_id, MKV_S_TEXTSSA)) + strcmp(track->codec_id, MKV_S_TEXTSSA) && + strcmp(track->codec_id, "S_SSA")) mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Subtitle type '%s' is not " "supported. Track will not be displayed.\n", track->codec_id); else { @@ -1913,7 +1914,8 @@ if (!strcmp(track->codec_id, MKV_S_TEXTUTF8)) sub_utf8 = 1; // Force UTF-8 conversion. - if (!strcmp(track->codec_id, MKV_S_TEXTSSA)) { + if (!strcmp(track->codec_id, MKV_S_TEXTSSA) || + !strcmp(track->codec_id, "S_SSA")) { mkv_d->subtitle_type = MKV_SUBTYPE_SSA; sub_utf8 = 1; } else

1 0

CVS: main/vidix/drivers mga_vid.c,1.21,1.22
by Sascha Sommer CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/vidix/drivers In directory mail:/var/tmp.root/cvs-serv1909/vidix/drivers Modified Files: mga_vid.c Log Message: workaround for mingw Index: mga_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/vidix/drivers/mga_vid.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mga_vid.c 31 Mar 2003 00:14:35 -0000 1.21 +++ mga_vid.c 2 Oct 2003 15:40:15 -0000 1.22 @@ -60,6 +60,10 @@ #include "../../libdha/pci_ids.h" #include "../../libdha/pci_names.h" +#ifdef __MINGW32__ +#define ENOTSUP 134 +#endif + #if !defined(ENOTSUP) && defined(EOPNOTSUPP) #define ENOTSUP EOPNOTSUPP #endif

1 0

CVS: main/vidix vidixlib.c,1.11,1.12
by Sascha Sommer CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/vidix In directory mail:/var/tmp.root/cvs-serv1008/vidix Modified Files: vidixlib.c Log Message: Windows port Index: vidixlib.c =================================================================== RCS file: /cvsroot/mplayer/main/vidix/vidixlib.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vidixlib.c 20 May 2002 00:04:47 -0000 1.11 +++ vidixlib.c 2 Oct 2003 15:33:12 -0000 1.12 @@ -21,7 +21,21 @@ #include <errno.h> #include <string.h> +#ifndef WIN32 #include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */ +#else +#include <windows.h> +#define dlsym(h,s) GetProcAddress(h,s) +#define dlopen(h,s) LoadLibrary(h) +#define dlclose(h) FreeLibrary(h) +static char* dlerror(){ + char errormsg[10]; + sprintf(errormsg,"%i\n",GetLastError()); + return errormsg; +} +#endif + + #include <dirent.h> #if defined(__OpenBSD__) && !defined(__ELF__)

1 0

CVS: main/libvo vosub_vidix.c,1.59,1.60
by Sascha Sommer CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv30968/libvo Modified Files: vosub_vidix.c Log Message: mingw port Index: vosub_vidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- vosub_vidix.c 14 Aug 2003 01:24:17 -0000 1.59 +++ vosub_vidix.c 2 Oct 2003 15:01:51 -0000 1.60 @@ -12,10 +12,12 @@ */ #include <inttypes.h> -#include <sys/ioctl.h> #include <unistd.h> #include <fcntl.h> +#ifndef __MINGW32__ +#include <sys/ioctl.h> #include <sys/mman.h> +#endif #include <stdio.h> #include <stdlib.h> #include <string.h>

1 0

CVS: main/libdha libdha.c,1.10,1.11 pci.c,1.12,1.13
by Sascha Sommer CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/libdha In directory mail:/var/tmp.root/cvs-serv25349/libdha Modified Files: libdha.c pci.c Log Message: port libdha to mingw Index: libdha.c =================================================================== RCS file: /cvsroot/mplayer/main/libdha/libdha.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libdha.c 2 Feb 2003 12:27:35 -0000 1.10 +++ libdha.c 2 Oct 2003 14:47:56 -0000 1.11 @@ -126,7 +126,6 @@ mmap: return mmap(0,size,PROT_READ|PROT_WRITE,MAP_SHARED,mem_fd,base); } -#endif /* Generic mmap (not win32, nor os2) */ void unmap_phys_mem(void *ptr, unsigned long size) { @@ -143,6 +142,8 @@ return; } + +#endif /* Generic mmap (not win32, nor os2) */ unsigned char INPORT8(unsigned idx) { Index: pci.c =================================================================== RCS file: /cvsroot/mplayer/main/libdha/pci.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- pci.c 31 Mar 2003 00:14:13 -0000 1.12 +++ pci.c 2 Oct 2003 14:47:56 -0000 1.13 @@ -89,6 +89,9 @@ #include "sysdep/pci_os2.c" #elif defined (_WIN32) || defined(__CYGWIN__) #include "sysdep/pci_win32.c" +#ifdef __MINGW32__ +#define ENOTSUP 134 /* Not supported */ +#endif #endif #if 0

1 0

CVS: main/libdha/sysdep AsmMacros_x86.h,1.3,1.4 libdha_win32.c,1.1,1.2
by Sascha Sommer CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/libdha/sysdep In directory mail:/var/tmp.root/cvs-serv25349/libdha/sysdep Modified Files: AsmMacros_x86.h libdha_win32.c Log Message: port libdha to mingw Index: AsmMacros_x86.h =================================================================== RCS file: /cvsroot/mplayer/main/libdha/sysdep/AsmMacros_x86.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AsmMacros_x86.h 20 Dec 2002 21:07:27 -0000 1.3 +++ AsmMacros_x86.h 2 Oct 2003 14:48:17 -0000 1.4 @@ -7,9 +7,9 @@ #ifndef __ASM_MACROS_X86_H #define __ASM_MACROS_X86_H -#if defined (WINNT) -#error This stuff is not ported on your system -#else +//#if defined (WINNT) +//#error This stuff is not ported on your system +//#else #include "config.h" @@ -280,4 +280,4 @@ #endif -#endif +//#endif Index: libdha_win32.c =================================================================== RCS file: /cvsroot/mplayer/main/libdha/sysdep/libdha_win32.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libdha_win32.c 15 Jan 2002 08:31:53 -0000 1.1 +++ libdha_win32.c 2 Oct 2003 14:48:17 -0000 1.2 @@ -5,7 +5,6 @@ */ #include <windows.h> - /* This is the request structure that applications use to request services from the MAPDEV VxD. @@ -34,7 +33,7 @@ ((DeviceType)<<16) | ((Access)<<14) | ((Function)<<2) | (Method) ) /* Memory Map a piece of Real Memory */ -void *map_phys_mem(unsigned base, unsigned size) { +void *map_phys_mem(unsigned long base, unsigned long size) { HANDLE hDevice ; PVOID inBuf[1] ; /* buffer for struct pointer to VxD */ @@ -66,5 +65,4 @@ return (void*)req.mdr_LinearAddress ; } -void unmap_phys_mem(void *ptr, unsigned size) { } - +void unmap_phys_mem(void *ptr, unsigned long size) { }

1 0

CVS: main configure,1.775,1.776
by Sascha Sommer CVS 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv19622 Modified Files: configure Log Message: new vidix vo modules for textmode console and windows Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.775 retrieving revision 1.776 diff -u -r1.775 -r1.776 --- configure 26 Sep 2003 18:07:47 -0000 1.775 +++ configure 2 Oct 2003 14:25:26 -0000 1.776 @@ -5418,6 +5418,18 @@ # TODO cleanup the VIDIX stuff here _def_vidix='#define CONFIG_VIDIX 1' test "$_vidix" = no && _def_vidix='#undef CONFIG_VIDIX' +if test "$_vidix" = yes; then + _vosrc="$_vosrc vo_consolevidix.c" + _vomodules="consolevidix $_vomodules" +else + _novomodules="consolevidix $_novomodules" +fi +if test "$_vidix" = yes && (cygwin || mingw32); then + _vosrc="$_vosrc vo_winvidix.c" + _vomodules="winvidix $_vomodules" +else + _novomodules="winvidix $_novomodules" +fi if test "$_vidix" = yes && test "$_x11" = yes; then _vosrc="$_vosrc vo_xvidix.c" _vomodules="xvidix $_vomodules"

1 0

CVS: main/libmpcodecs ad_liba52.c,1.10,1.11
by Alex Beregszaszi 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv8888 Modified Files: ad_liba52.c Log Message: fix for bigendian systems Index: ad_liba52.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_liba52.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ad_liba52.c 17 May 2003 11:35:32 -0000 1.10 +++ ad_liba52.c 26 Sep 2003 19:36:19 -0000 1.11 @@ -48,7 +48,9 @@ if(c<0) return -1; /* EOF*/ sh_audio->a_in_buffer[sh_audio->a_in_buffer_len++]=c; } +#ifndef WORDS_BIGENDIAN if(sh_audio->format!=0x2000) swab(sh_audio->a_in_buffer,sh_audio->a_in_buffer,8); +#endif length = a52_syncinfo (sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate); if(length>=7 && length<=3840) break; /* we're done.*/ /* bad file => resync*/

3 3

CVS: main/libmpcodecs ad_liba52.c,1.11,1.12
by Alex Beregszaszi 02 Oct '03

02 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv17156 Modified Files: ad_liba52.c Log Message: reversing my brokeness, but imho dnet is still broken on BE systems Index: ad_liba52.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_liba52.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ad_liba52.c 26 Sep 2003 19:36:19 -0000 1.11 +++ ad_liba52.c 2 Oct 2003 14:13:52 -0000 1.12 @@ -48,9 +48,7 @@ if(c<0) return -1; /* EOF*/ sh_audio->a_in_buffer[sh_audio->a_in_buffer_len++]=c; } -#ifndef WORDS_BIGENDIAN if(sh_audio->format!=0x2000) swab(sh_audio->a_in_buffer,sh_audio->a_in_buffer,8); -#endif length = a52_syncinfo (sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate); if(length>=7 && length<=3840) break; /* we're done.*/ /* bad file => resync*/

1 0