From 2cfb08e9cc94e0707056edd5432a1c0ca66eeca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Fri, 16 Mar 2007 22:49:16 +0000
Subject: Always pass alternate, and avoid checking for .6.0.

CVS patchset: 8690
CVS date: 2007/03/16 22:49:16
---
 src/libreal/real_common.c  | 12 +-----------
 src/libreal/xine_decoder.c |  6 +++---
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/libreal/real_common.c b/src/libreal/real_common.c
index 28c37c33e..dbe528ee0 100644
--- a/src/libreal/real_common.c
+++ b/src/libreal/real_common.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: real_common.c,v 1.9 2007/03/16 22:46:49 dgp85 Exp $
+ * $Id: real_common.c,v 1.10 2007/03/16 22:49:16 dgp85 Exp $
  *
  * Common function for the thin layer to use Real binary-only codecs in xine
  */
@@ -120,16 +120,6 @@ void *_x_real_codec_open(xine_stream_t *const stream, const char *const path,
   char *codecpath = NULL;
   void *codecmodule = NULL;
   
-  asprintf(&codecpath, "%s/%s.6.0", path, codec_name);
-  if ( (codecmodule = dlopen(codecpath, RTLD_NOW)) ) {
-    free(codecpath);
-    return codecmodule;
-  }
-
-  xprintf (stream->xine, XINE_VERBOSITY_DEBUG,
-	   LOG_MODULE ": error loading %s: %s\n", codecpath, dlerror());
-
-  free(codecpath);
   asprintf(&codecpath, "%s/%s", path, codec_name);
   if ( (codecmodule = dlopen(codecpath, RTLD_NOW)) ) {
     free(codecpath);
diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_decoder.c
index 761b4bfc2..8c5ac00d2 100644
--- a/src/libreal/xine_decoder.c
+++ b/src/libreal/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.90 2007/03/16 22:46:49 dgp85 Exp $
+ * $Id: xine_decoder.c,v 1.91 2007/03/16 22:49:16 dgp85 Exp $
  *
  * thin layer to use real binary-only codecs in xine
  *
@@ -109,7 +109,7 @@ void __pure_virtual(void);
  * real codec loader
  */
 
-static int load_syms_linux (realdec_decoder_t *this, const char *codec_name, const char *const codec_alternate = NULL) {
+static int load_syms_linux (realdec_decoder_t *this, const char *codec_name, const char *const codec_alternate) {
   cfg_entry_t* entry =
     this->stream->xine->config->lookup_entry(this->stream->xine->config,
 					     "decoder.external.real_codecs_path");
@@ -158,7 +158,7 @@ static int init_codec (realdec_decoder_t *this, buf_element_t *buf) {
   switch (buf->type) {
   case BUF_VIDEO_RV20:
     _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 2.0");
-    if (!load_syms_linux (this, "drv2.so"))
+    if (!load_syms_linux (this, "drv2.so", "drv2.so.6.0"))
       return 0;
     break;
   case BUF_VIDEO_RV30:
-- 
cgit v1.2.3