File xine-lib-1.1.21-demuxcheckfor_mad_ffmpeg.patch of Package xine-lib

File xine-lib-1.1.21-demuxcheckfor_mad_ffmpeg.patch of Package xine-lib (Revision 21)

Currently displaying revision 21, show latest

diff -ur xine-lib-1.1.21.orig/src/xine-engine/load_plugins.c xine-lib-1.1.21/src/xine-engine/load_plugins.c
--- xine-lib-1.1.21.orig/src/xine-engine/load_plugins.c	2012-01-18 21:57:28.000000000 +0100
+++ xine-lib-1.1.21/src/xine-engine/load_plugins.c	2012-06-10 21:11:49.019156601 +0200
@@ -2504,9 +2504,18 @@
 
   plugin_catalog_t *catalog = self->plugin_catalog;
   int               list_id;
+  int               havempgdecoder = 0;
+  const char * const * p;
 
   pthread_mutex_lock (&catalog->lock);
 
+  _build_list_typed_plugins(&catalog, catalog->plugin_lists[PLUGIN_AUDIO_DECODER - 1]);
+  for (p = catalog->ids; p && *p; p++) {
+    if (strcmp (*p, "mad") == 0 || strcmp (*p, "ffmpegaudio") == 0) {
+      havempgdecoder = 1;
+      break;
+    }
+  }
   /* calc length of output string and create an array of strings to
      concatenate */
   size_t len = 0;
@@ -2518,7 +2527,13 @@
     if (node->plugin_class || _load_plugin_class(self, node, NULL)) {
       demux_class_t *const cls = (demux_class_t *)node->plugin_class;
       if( (extensions[list_id] = cls->get_extensions(cls)) != NULL )
-	len += strlen(extensions[list_id]) +1;
+      {
+	if(havempgdecoder || !strstr(extensions[list_id], "mp3")) {
+	  len += strlen(extensions[list_id]) +1;
+	} else {
+	  extensions[list_id] = NULL;
+	}
+      }
     }
   }