Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv12294/libmpcodecs Modified Files: ad_real.c vd_real.c Log Message: Implement Nilmoni's and Bernd Ernesti's patches for: Better real codec dir detection and NetBSD real support. Fix Nilmonis code, so it's working like expected. Move a debug printf to mp_msg and some fixes in demux_real.c. Some cosmetics :) -> RealPlayer 8 to RealPlayer, as RealOne (aka RealPlayer 9 works, too) Index: ad_real.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_real.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ad_real.c 10 Jun 2002 16:40:20 -0000 1.7 +++ ad_real.c 13 Jun 2002 00:14:28 -0000 1.8 @@ -31,8 +31,8 @@ return malloc(size); } -#ifdef __FreeBSD__ -void* __ctype_b=NULL; +#if defined(__FreeBSD__) || defined(__NetBSD__) +void *__ctype_b=NULL; #endif static ulong (*raCloseCodec)(ulong); @@ -64,7 +64,7 @@ int len; void* prop; char path[4096]; - sprintf(path, LIBDIR "/real/%s", sh->codec->dll); + sprintf(path, REALCODEC_PATH "/%s", sh->codec->dll); handle = dlopen (path, RTLD_LAZY); if(!handle){ mp_msg(MSGT_DECAUDIO,MSGL_WARN,"Cannot open dll: %s\n",dlerror()); Index: vd_real.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_real.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- vd_real.c 9 Jun 2002 19:53:13 -0000 1.5 +++ vd_real.c 13 Jun 2002 00:14:28 -0000 1.6 @@ -14,7 +14,7 @@ #include "vd_internal.h" static vd_info_t info = { - "RealPlayer 8 video codecs", + "RealVideo decoder", "real", VFM_REAL, "Florian Schneider", @@ -48,11 +48,11 @@ // exit(1); } -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__) void ___brk_addr(void) {exit(0);} -char** __environ={NULL}; +char **__environ={NULL}; #undef stderr -FILE* stderr=NULL; +FILE *stderr=NULL; #endif // to set/get/query special features/parameters @@ -147,11 +147,11 @@ mp_msg(MSGT_DECVIDEO,MSGL_V,"realvideo codec id: 0x%08X sub-id: 0x%08X\n",extrahdr[1],extrahdr[0]); - sprintf(path, LIBDIR "/real/%s", sh->codec->dll); + sprintf(path, REALCODEC_PATH "/%s", sh->codec->dll); if(!load_syms(path)){ mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingDLLcodec,sh->codec->dll); - mp_msg(MSGT_DECVIDEO,MSGL_HINT,"You need to copy the contents of the codecs directory from RealPlayer8\n"); - mp_msg(MSGT_DECVIDEO,MSGL_HINT,"into " LIBDIR "/real/ !\n"); + mp_msg(MSGT_DECVIDEO,MSGL_HINT,"You need to copy the contents from the RealPlayer codecs directory\n"); + mp_msg(MSGT_DECVIDEO,MSGL_HINT,"into " REALCODEC_PATH "/ !\n"); return 0; } // only I420 supported