[SCM] gmerlin/master: refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1248db8553fed399d51cf40c7d00dccc9469b59b
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 13:10:23 2012 +0200

    refresh
    
    Git-Dch: Ignore

diff --git a/debian/patches/fix_zeroplugins.patch b/debian/patches/fix_zeroplugins.patch
index 80f9c3a..31fe1e6 100644
--- a/debian/patches/fix_zeroplugins.patch
+++ b/debian/patches/fix_zeroplugins.patch
@@ -1,8 +1,12 @@
 Author: IOhannes m zmölnig
 Description: prevent segfaults if no plugins can be found
+---
+ lib/pluginregistry.c |   21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
 --- gmerlin.orig/lib/pluginregistry.c
 +++ gmerlin/lib/pluginregistry.c
-@@ -174,6 +174,9 @@
+@@ -225,6 +225,9 @@ static bg_plugin_info_t * sort_by_priori
    bg_plugin_info_t ** arr;
    int num_plugins = 0;
    int keep_going;
@@ -12,19 +16,9 @@ Description: prevent segfaults if no plugins can be found
    
    /* Count plugins */
  
-@@ -216,7 +219,8 @@
- 
-   for(i = 0; i < num_plugins-1; i++)
-     arr[i]->next = arr[i+1];
--  arr[num_plugins-1]->next = (bg_plugin_info_t*)0;
-+  if(num_plugins>0)
-+    arr[num_plugins-1]->next = (bg_plugin_info_t*)0;
-   list = arr[0];
-   /* Free array */
-   free(arr);
-@@ -957,16 +961,18 @@
-   if(ret->singlepic_encoder)
-     ret->entries = append_to_list(ret->entries, ret->singlepic_encoder);
+@@ -1028,16 +1031,18 @@ bg_plugin_registry_t *
+     ret->entries = append_to_list(ret->entries, tmp_info);
+   
    
 -  /* Sort */
 -

-- 
gmerlin packaging