[SCM] morituri/master: * morituri/common/gstreamer.py: Also remove audioparsers if it's in bad.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ef56a14dc0ecdb38d17737b75c0ccc638d4b58e9
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Wed May 25 08:26:23 2011 +0000

    	* morituri/common/gstreamer.py:
    	  Also remove audioparsers if it's in bad.

diff --git a/ChangeLog b/ChangeLog
index 1dee4a2..2c2124f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-25  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/gstreamer.py:
+	  Also remove audioparsers if it's in bad.
+
 2011-05-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:
diff --git a/morituri/common/gstreamer.py b/morituri/common/gstreamer.py
index 991f23b..afee756 100644
--- a/morituri/common/gstreamer.py
+++ b/morituri/common/gstreamer.py
@@ -177,5 +177,12 @@ def removeAudioParsers():
     import gst
     registry = gst.registry_get_default()
     plugin = registry.find_plugin("audioparsers")
-    if plugin and plugin.get_version() <= '0.10.29.1':
-        registry.remove_plugin(plugin)
+    if not plugin:
+        return
+
+    if plugin.get_source() == 'gst-plugins-good' \
+        and plugin.get_version() > '0.10.29.1':
+        return
+
+    # always remove from bad
+    registry.remove_plugin(plugin)

-- 
morituri packaging