[patch] ogmrip-0.12.0-uninitialized.patch

ogmrip-0.12.0-uninitialized.patch (text/plain), 2.17 KB, created by Olivier Rolland on 2008-07-13 22:28:16 UTC

diff -Naur libogmrip.orig/ogmrip-lavc.c libogmrip/ogmrip-lavc.c
--- libogmrip.orig/ogmrip-lavc.c	2008-07-13 23:22:04.000000000 +0200
+++ libogmrip/ogmrip-lavc.c	2008-07-13 22:51:29.000000000 +0200
@@ -125,8 +125,7 @@
   GString *options;
 
   const gchar *output, *codec;
-  gint bitrate, vid, dia, predia, header, threads;
-  guint cmp, precmp, subcmp;
+  gint bitrate, vid, threads;
 
   g_return_val_if_fail (OGMRIP_IS_VIDEO_CODEC (video), NULL);
 
@@ -183,14 +182,14 @@
   if (lavc->priv->max_rate > 0)
     g_string_append_printf (options, ":vrc_maxrate=%u", lavc->priv->max_rate);
 
-  ogmrip_lavc_get_cmp (OGMRIP_LAVC (video), &cmp, &precmp, &subcmp);
-  g_string_append_printf (options, ":precmp=%u:subcmp=%u:cmp=%u", precmp, subcmp, cmp);
+  if (lavc->priv->cmp != 0 || lavc->priv->precmp != 0 || lavc->priv->subcmp != 0)
+    g_string_append_printf (options, ":precmp=%u:subcmp=%u:cmp=%u", lavc->priv->precmp, lavc->priv->subcmp, lavc->priv->cmp);
 
-  ogmrip_lavc_get_dia (OGMRIP_LAVC (video), &dia, &predia);
-  g_string_append_printf (options, ":dia=%d:predia=%d", dia, predia);
+  if (lavc->priv->dia != 1 || lavc->priv->predia != 1)
+    g_string_append_printf (options, ":dia=%d:predia=%d", lavc->priv->dia, lavc->priv->predia);
 
-  header = ogmrip_lavc_get_header (OGMRIP_LAVC (video));
-  g_string_append_printf (options, ":vglobal=%d", header);
+  if (lavc->priv->header != 0)
+    g_string_append_printf (options, ":vglobal=%d", lavc->priv->header);
 
   g_string_append_printf (options, ":vmax_b_frames=%d", ogmrip_video_codec_get_max_b_frames (video));
 
diff -Naur libogmrip.orig/ogmrip-video-codec.c libogmrip/ogmrip-video-codec.c
--- libogmrip.orig/ogmrip-video-codec.c	2008-07-13 23:22:04.000000000 +0200
+++ libogmrip/ogmrip-video-codec.c	2008-07-13 23:22:34.000000000 +0200
@@ -572,8 +572,8 @@
   {
     guint scale_width, scale_height;
 
-    ogmrip_video_codec_get_scale_size (video, &scale_width, &scale_height);
-    if (scale_width > max_width || scale_height > max_height)
+    if (ogmrip_video_codec_get_scale_size (video, &scale_width, &scale_height) &&
+        (scale_width > max_width || scale_height > max_height))
     {
       gdouble ratio = scale_width / (gdouble) scale_height;