Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv3112 Modified Files: vd_realvid.c Log Message: possible 10l Index: vd_realvid.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_realvid.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- vd_realvid.c 22 Dec 2002 18:10:45 -0000 1.19 +++ vd_realvid.c 10 Feb 2003 15:02:05 -0000 1.20 @@ -99,7 +99,7 @@ void *handle; mp_msg(MSGT_DECVIDEO,MSGL_INFO, "opening shared obj '%s'\n", path); - rv_handle = handle = dlopen (path, RTLD_LAZY); + handle = dlopen (path, RTLD_LAZY); if (!handle) { mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Error: %s\n",dlerror()); return 0; @@ -115,11 +115,14 @@ rvyuv_free && rvyuv_hive_message && rvyuv_init && - rvyuv_transform) return 1; + rvyuv_transform) + { + rv_handle = handle; + return 1; + } mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Error resolving symbols! (version incompatibility?)\n"); - dlclose(rv_handle); - rv_handle = NULL; + dlclose(handle); return 0; } @@ -133,10 +136,9 @@ static int load_syms_windows(char *path) { void *handle; - mp_msg(MSGT_DECVIDEO,MSGL_INFO, "opening win32 dll '%s'\n", path); Setup_LDT_Keeper(); - rv_handle = handle = LoadLibraryA(path); + handle = LoadLibraryA(path); mp_msg(MSGT_DECVIDEO,MSGL_V,"win32 real codec handle=%p \n",handle); if (!handle) { mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Error loading dll\n"); @@ -148,18 +150,19 @@ wrvyuv_hive_message = GetProcAddress(handle, "RV20toYUV420HiveMessage"); wrvyuv_init = GetProcAddress(handle, "RV20toYUV420Init"); wrvyuv_transform = GetProcAddress(handle, "RV20toYUV420Transform"); - - dll_type = 1; - + if(wrvyuv_custom_message && wrvyuv_free && wrvyuv_hive_message && wrvyuv_init && - wrvyuv_transform) return 1; - + wrvyuv_transform) + { + dll_type = 1; + rv_handle = handle; + return 1; + } mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Error resolving symbols! (version incompatibility?)\n"); - FreeLibrary(rv_handle); - rv_handle = NULL; + FreeLibrary(handle); return 0; // error } #endif @@ -199,8 +202,7 @@ #endif { mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingDLLcodec,sh->codec->dll); - 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"); + mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Read the RealVideo section of the DOCS!\n"); return 0; } // only I420 supported