cheese r870 - in trunk: . src

[fargiolas svn gnome org]

Author: fargiolas
Date: Fri Aug  8 10:27:25 2008
New Revision: 870
URL: http://svn.gnome.org/viewvc/cheese?rev=870&view=rev

Log:
don't try to find highest framerate if format is NULL, courtesy of Todd Eisenberger


Modified:
   trunk/ChangeLog
   trunk/src/cheese-webcam.c

Modified: trunk/src/cheese-webcam.c
==============================================================================
--- trunk/src/cheese-webcam.c	(original)
+++ trunk/src/cheese-webcam.c	Fri Aug  8 10:27:25 2008
@@ -679,12 +679,12 @@
     priv->current_format = format;
     g_free (resolution);
     
-    find_highest_framerate (format, &framerate_numerator, 
-                            &framerate_denominator);
-    
     if (format == NULL)
       goto fallback;
 
+    find_highest_framerate (format, &framerate_numerator, 
+                            &framerate_denominator);
+
     webcam_input = g_strdup_printf ("%s name=video_source device=%s ! capsfilter name=capsfilter caps=%s,width=%d,height=%d,framerate=%d/%d ! identity",
                                     selected_webcam->gstreamer_src,
                                     selected_webcam->video_device,