brasero r1433 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Tue Oct 28 09:16:49 2008
New Revision: 1433
URL: http://svn.gnome.org/viewvc/brasero?rev=1433&view=rev

Log:
	Fix #557810  â Video Project Compute File size Hang
	Don\'t tell the user that a video file hasn\'t video if we can\'t create a
	snapshot

	* src/brasero-metadata.c (brasero_metadata_create_video_pipeline),
	(brasero_metadata_new_decoded_pad_cb):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-metadata.c

Modified: trunk/src/brasero-metadata.c
==============================================================================
--- trunk/src/brasero-metadata.c	(original)
+++ trunk/src/brasero-metadata.c	Tue Oct 28 09:16:49 2008
@@ -1134,9 +1134,6 @@
 		priv->video = NULL;
 
 		BRASERO_BURN_LOG ("gdkpixbufsink is not installed");
-		priv->error = g_error_new (BRASERO_ERROR,
-					   BRASERO_ERROR_GENERAL,
-					   "Can't create gdkpixbufsink");
 		return FALSE;
 	}
 	gst_bin_add (GST_BIN (priv->video), priv->snapshot);
@@ -1153,9 +1150,6 @@
 		priv->video = NULL;
 
 		BRASERO_BURN_LOG ("ffmpegcolorspace is not installed");
-		priv->error = g_error_new (BRASERO_ERROR,
-					   BRASERO_ERROR_GENERAL,
-					   "Can't create gdkpixbufsink");
 		return FALSE;
 	}
 	gst_bin_add (GST_BIN (priv->video), colorspace);
@@ -1318,8 +1312,7 @@
 		else if (!brasero_metadata_link_dummy_pad (self, pad))
 			brasero_metadata_error_on_pad_linking (self);
 	}
-	else if (has_video
-	     && !brasero_metadata_link_dummy_pad (self, pad))
+	else if (has_video && !brasero_metadata_link_dummy_pad (self, pad))
 		brasero_metadata_error_on_pad_linking (self);
 
 	gst_caps_unref (caps);