[Pkg-gstreamer-commits] [SCM] GStreamer Bad Plugins 0.10 Packaging branch, master, updated. debian/0.10.23-2-3-g662b50f

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit 8aeecebd0d620f735a6a6a052a2b04a38028e376
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Tue May 22 11:42:06 2012 +0200

    debian/patches/0001-vp8enc-fix-target-bitrate-config-with-libvpx-1.1.0.patch: Fix patch to apply cleanly

diff --git a/debian/patches/0001-vp8enc-fix-target-bitrate-config-with-libvpx-1.1.0.patch b/debian/patches/0001-vp8enc-fix-target-bitrate-config-with-libvpx-1.1.0.patch
index 3782699..39805f5 100644
--- a/debian/patches/0001-vp8enc-fix-target-bitrate-config-with-libvpx-1.1.0.patch
+++ b/debian/patches/0001-vp8enc-fix-target-bitrate-config-with-libvpx-1.1.0.patch
@@ -16,23 +16,23 @@ https://bugzilla.gnome.org/show_bug.cgi?id=676245
  ext/vp8/gstvp8enc.c |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c
-index 9b0c4fe..6316021 100644
---- a/ext/vp8/gstvp8enc.c
-+++ b/ext/vp8/gstvp8enc.c
-@@ -734,6 +734,11 @@ gst_vp8_enc_set_format (GstVideoEncoder * video_encoder,
+Index: gst-plugins-bad0.10/ext/vp8/gstvp8enc.c
+===================================================================
+--- gst-plugins-bad0.10.orig/ext/vp8/gstvp8enc.c	2012-02-21 11:25:03.000000000 +0100
++++ gst-plugins-bad0.10/ext/vp8/gstvp8enc.c	2012-05-22 11:41:43.589686599 +0200
+@@ -732,6 +732,11 @@
      return FALSE;
    }
  
 +  /* Scale default bitrate to our size */
 +  cfg.rc_target_bitrate = gst_util_uint64_scale (cfg.rc_target_bitrate,
-+      GST_VIDEO_INFO_WIDTH (info) * GST_VIDEO_INFO_HEIGHT (info),
++      state->width * state->height,
 +      cfg.g_w * cfg.g_h);
 +
-   cfg.g_w = GST_VIDEO_INFO_WIDTH (info);
-   cfg.g_h = GST_VIDEO_INFO_HEIGHT (info);
-   cfg.g_timebase.num = GST_VIDEO_INFO_FPS_D (info);
-@@ -757,7 +762,6 @@ gst_vp8_enc_set_format (GstVideoEncoder * video_encoder,
+   cfg.g_w = state->width;
+   cfg.g_h = state->height;
+   cfg.g_timebase.num = state->fps_d;
+@@ -755,7 +760,6 @@
    } else {
      cfg.rc_min_quantizer = (gint) (63 - encoder->quality * 6.2);
      cfg.rc_max_quantizer = (gint) (63 - encoder->quality * 6.2);
@@ -40,6 +40,3 @@ index 9b0c4fe..6316021 100644
    }
    cfg.rc_dropframe_thresh = encoder->drop_frame;
    cfg.rc_resize_allowed = encoder->resize_allowed;
--- 
-1.7.10
-

-- 
GStreamer Bad Plugins 0.10 Packaging