diff options
| author | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-13 00:14:28 +0000 |
|---|---|---|
| committer | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-13 00:14:28 +0000 |
| commit | d32c4241daeee74d40f97738bf65a605847a46d9 (patch) | |
| tree | 945dc9a4c6d14311d21790520fd8ddfaccacbb6e /libmpcodecs | |
| parent | fd0c3b7c62b11d7c4218b131b8db78bc17380e75 (diff) | |
| download | mpv-d32c4241daeee74d40f97738bf65a605847a46d9.tar.bz2 mpv-d32c4241daeee74d40f97738bf65a605847a46d9.tar.xz | |
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)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6405 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_real.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/vd_real.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libmpcodecs/ad_real.c b/libmpcodecs/ad_real.c index 2e9ee11610..26ac42d299 100644 --- a/libmpcodecs/ad_real.c +++ b/libmpcodecs/ad_real.c @@ -31,8 +31,8 @@ void *__builtin_new(unsigned long size) { 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 @@ static int preinit(sh_audio_t *sh){ 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()); diff --git a/libmpcodecs/vd_real.c b/libmpcodecs/vd_real.c index c095110f6e..036fb5a3fd 100644 --- a/libmpcodecs/vd_real.c +++ b/libmpcodecs/vd_real.c @@ -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 @@ void __pure_virtual(void) { // 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 @@ static int init(sh_video_t *sh){ 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 |