10139N/A--- ./src/cheese-webcam.c.orig 2008-09-01 11:16:01.916287000 +0800

10139N/A+++ ./src/cheese-webcam.c 2008-09-01 11:17:05.996507000 +0800

10139N/A@@ -620,8 +620,13 @@

12147N/A }

10139N/A }

10139N/A

10139N/A+#ifdef SOLARIS

10139N/A+ *numerator = 15;

10139N/A+ *denominator = 2;

10139N/A+#else

10139N/A *numerator = framerate_numerator;

10139N/A *denominator = framerate_denominator;

10139N/A+#endif

12480N/A }

10139N/A

10139N/A static gboolean

10139N/A@@ -956,7 +961,7 @@

10139N/A return FALSE;

11819N/A

10139N/A gst_bin_add_many (GST_BIN (priv->video_save_bin), priv->audio_source, audio_queue,

10139N/A- audio_convert, audio_enc, video_save_csp, video_save_rate, video_save_scale, video_enc,

10139N/A+ audio_convert, audio_enc, video_save_csp, video_save_scale, video_enc,

10139N/A mux, priv->video_file_sink, NULL);

10139N/A

11023N/A /* add ghostpad */

11875N/A@@ -968,7 +973,7 @@

10139N/A ok = gst_element_link_many (priv->audio_source, audio_queue, audio_convert,

10139N/A audio_enc, mux, priv->video_file_sink, NULL);

10139N/A

10139N/A- ok &= gst_element_link_many (video_save_csp, video_save_rate, video_save_scale, video_enc,

10139N/A+ ok &= gst_element_link_many (video_save_csp, video_save_scale, video_enc,

10139N/A NULL);

10139N/A ok &= gst_element_link (video_enc, mux);

10139N/A

10139N/A--- ./src/cheese-gconf.c.orig 2008-08-19 02:32:53.000000000 +0800

10139N/A+++ ./src/cheese-gconf.c 2008-09-01 11:17:05.997071000 +0800

10139N/A@@ -103,14 +103,18 @@

10139N/A g_slist_free (tmp);

10139N/A break;

10139N/A case GCONF_PROP_X_RESOLUTION:

10139N/A+ gdk_threads_enter();

10139N/A g_value_set_int (value, gconf_client_get_int (priv->client,

10139N/A CHEESE_GCONF_PREFIX "/x_resolution",

10139N/A NULL));

10139N/A+ gdk_threads_leave();

10139N/A break;

10139N/A case GCONF_PROP_Y_RESOLUTION:

10139N/A+ gdk_threads_enter();

10139N/A g_value_set_int (value, gconf_client_get_int (priv->client,

10139N/A CHEESE_GCONF_PREFIX "/y_resolution",

10139N/A NULL));

10139N/A+ gdk_threads_leave();

10139N/A break;

10139N/A case GCONF_PROP_VIDEO_PATH:

10139N/A g_value_set_string (value, gconf_client_get_string (priv->client,

10139N/A