totem r5658 - in branches/gnome-2-24: . src/backend

[hadess svn gnome org]

Author: hadess
Date: Tue Sep  9 13:38:53 2008
New Revision: 5658
URL: http://svn.gnome.org/viewvc/totem?rev=5658&view=rev

Log:
2008-09-09  Bastien Nocera  <hadess hadess net>

	* src/backend/bacon-video-widget-gst-0.10.c
	(bacon_video_widget_get_mrls): Also allow the Fluendo MPEG
	demuxers recently moved to GStreamer main



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/backend/bacon-video-widget-gst-0.10.c

Modified: branches/gnome-2-24/src/backend/bacon-video-widget-gst-0.10.c
==============================================================================
--- branches/gnome-2-24/src/backend/bacon-video-widget-gst-0.10.c	(original)
+++ branches/gnome-2-24/src/backend/bacon-video-widget-gst-0.10.c	Tue Sep  9 13:38:53 2008
@@ -4100,7 +4100,8 @@
 	g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
 		     "XXX Do not use XXX");
         return NULL;
-      } else if (gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 0) &&
+      } else if (!gst_default_registry_check_feature_version ("mpegpsdemux", 0, 10, 0) &&
+		 gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 0) &&
       		 !gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 15)) {
         GST_DEBUG ("flupsdemux not new enough for DVD playback");
 	g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
@@ -4122,7 +4123,8 @@
 		     "XXX Do not use XXX");
         return NULL;
       }
-      if (gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 0) &&
+      if (!gst_default_registry_check_feature_version ("mpegpsdemux", 0, 10, 0) &&
+	  gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 0) &&
       	  !gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 15)) {
         GST_DEBUG ("flupsdemux not new enough for DVB playback");
 	g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,