[0.11] gst-plugins-good: videomixer: more fixes

Wim Taymans wtay at kemper.freedesktop.org
Thu Jan 26 09:51:46 PST 2012


Module: gst-plugins-good
Branch: 0.11
Commit: 33ae3fe047ef5503aec27fe8827e3b37f9addc22
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=33ae3fe047ef5503aec27fe8827e3b37f9addc22

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Thu Jan 26 18:51:30 2012 +0100

videomixer: more fixes

---

 gst/videomixer/videomixer2.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c
index 30c7397..8f864e8 100644
--- a/gst/videomixer/videomixer2.c
+++ b/gst/videomixer/videomixer2.c
@@ -263,12 +263,12 @@ gst_videomixer2_update_src_caps (GstVideoMixer2 * mix)
       gst_structure_fixate_field_nearest_fraction (s, "framerate", best_fps_n,
           best_fps_d);
 
-      gst_structure_get_int (s, "width", &best_width);
-      gst_structure_get_int (s, "height", &best_height);
-      gst_structure_get_fraction (s, "fraction", &best_fps_n, &best_fps_d);
+      gst_structure_get_int (s, "width", &info.width);
+      gst_structure_get_int (s, "height", &info.height);
+      gst_structure_get_fraction (s, "fraction", &info.fps_n, &info.fps_d);
     }
 
-    mix->info = info;
+    caps = gst_video_info_to_caps (&info);
 
     GST_VIDEO_MIXER2_UNLOCK (mix);
     ret = gst_videomixer2_src_setcaps (mix->srcpad, mix, caps);



More information about the gstreamer-commits mailing list