Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
	common
	docs/libs/gst-plugins-base-libs.types
	ext/pango/gsttextoverlay.c
	ext/vorbis/gstvorbisdec.c
	gst/playback/gstplaysink.c
	gst/playback/gstplaysinkconvertbin.c
	sys/ximage/ximagesink.c
	sys/xvimage/xvimagesink.c

diff --cc configure.ac
Simple merge

diff --cc ext/pango/gsttextrender.c
index 8c60c09,6a9a29b..4bae712
--- 1/ext/pango/gsttextrender.c
--- 2/ext/pango/gsttextrender.c
+++ b/ext/pango/gsttextrender.c
@@@ -188,20 -201,9 +188,20 @@@ gst_text_render_class_init (GstTextRend
    gobject_class->set_property = gst_text_render_set_property;
    gobject_class->get_property = gst_text_render_get_property;
  
 +  gst_element_class_add_pad_template (gstelement_class,
 +      gst_static_pad_template_get (&src_template_factory));
 +  gst_element_class_add_pad_template (gstelement_class,
 +      gst_static_pad_template_get (&sink_template_factory));
 +
 +  gst_element_class_set_details_simple (gstelement_class, "Text renderer",
 +      "Filter/Editor/Video",
 +      "Renders a text string to an image bitmap",
 +      "David Schleef <ds@schleef.org>, "
 +      "GStreamer maintainers <gstreamer-devel@lists.sourceforge.net>");
 +
    fontmap = pango_cairo_font_map_get_default ();
    klass->pango_context =
-       pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap));
+       pango_font_map_create_context (PANGO_FONT_MAP (fontmap));
    g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_FONT_DESC,
        g_param_spec_string ("font-desc", "font description",
            "Pango font description of font "

diff --cc ext/vorbis/gstvorbisdec.c
index eb1f5f1,b17ebfe..5e3005b
--- 1/ext/vorbis/gstvorbisdec.c
--- 2/ext/vorbis/gstvorbisdec.c
+++ b/ext/vorbis/gstvorbisdec.c
@@@ -216,33 -298,29 +206,27 @@@ vorbis_handle_comment_packet (GstVorbis
  {
    guint bitrate = 0;
    gchar *encoder = NULL;
-   GstTagList *list, *old_list;
+   GstTagList *list;
 -  GstBuffer *buf;
 +  guint8 *data;
 +  gsize size;
  
    GST_DEBUG_OBJECT (vd, "parsing comment packet");
  
 -  buf = gst_buffer_new ();
 -  GST_BUFFER_DATA (buf) = gst_ogg_packet_data (packet);
 -  GST_BUFFER_SIZE (buf) = gst_ogg_packet_size (packet);
 +  data = gst_ogg_packet_data (packet);
 +  size = gst_ogg_packet_size (packet);
  
    list =
 -      gst_tag_list_from_vorbiscomment_buffer (buf, (guint8 *) "\003vorbis", 7,
 +      gst_tag_list_from_vorbiscomment (data, size, (guint8 *) "\003vorbis", 7,
        &encoder);
  
-   old_list = vd->taglist;
-   vd->taglist = gst_tag_list_merge (vd->taglist, list, GST_TAG_MERGE_REPLACE);
- 
-   if (old_list)
-     gst_tag_list_free (old_list);
-   gst_tag_list_free (list);
- 
-   if (!vd->taglist) {
+   if (!list) {
      GST_ERROR_OBJECT (vd, "couldn't decode comments");
-     vd->taglist = gst_tag_list_new_empty ();
+     list = gst_tag_list_new ();
    }
 -  gst_buffer_unref (buf);
 -
+ 
    if (encoder) {
      if (encoder[0])
-       gst_tag_list_add (vd->taglist, GST_TAG_MERGE_REPLACE,
+       gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
            GST_TAG_ENCODER, encoder, NULL);
      g_free (encoder);
    }

diff --cc ext/vorbis/gstvorbisdec.h
index 721b666,712e50e..f205597
--- 1/ext/vorbis/gstvorbisdec.h
--- 2/ext/vorbis/gstvorbisdec.h
+++ b/ext/vorbis/gstvorbisdec.h
@@@ -62,10 -62,8 +62,8 @@@ struct _GstVorbisDec 
  #endif
  
    gboolean          initialized;
 -  guint             width;
 +  GstAudioInfo      info;
  
-   GstTagList       *taglist;
- 
    CopySampleFunc    copy_samples;
  };
  

diff --cc gst-libs/gst/audio/gstaudiodecoder.c
Simple merge

diff --cc gst-libs/gst/audio/gstaudiodecoder.h
Simple merge

diff --cc gst-libs/gst/pbutils/gstdiscoverer.c
Simple merge

diff --cc gst-libs/gst/pbutils/install-plugins.c
Simple merge

diff --cc gst/playback/gstplaysink.c
index 79685d4,8757e2b..3291ea9
--- 1/gst/playback/gstplaysink.c
--- 2/gst/playback/gstplaysink.c
+++ b/gst/playback/gstplaysink.c
@@@ -3723,20 -3733,23 +3722,23 @@@ gst_play_sink_handle_message (GstBin * 
  
          GST_DEBUG_OBJECT (playsink, "Got prepare-xwindow-id message");
  
 -        if (playsink->xoverlay_handle_set)
 -          gst_x_overlay_set_window_handle (playsink->xoverlay_element,
 -              playsink->xoverlay_handle);
 -        if (playsink->xoverlay_handle_events_set)
 -          gst_x_overlay_handle_events (playsink->xoverlay_element,
 -              playsink->xoverlay_handle_events);
 -        if (playsink->xoverlay_render_rectangle_set)
 -          gst_x_overlay_set_render_rectangle (playsink->xoverlay_element,
 -              playsink->xoverlay_x, playsink->xoverlay_y,
 -              playsink->xoverlay_width, playsink->xoverlay_height);
 -
 -        gst_object_unref (xoverlay);
 +        if (playsink->overlay_handle_set)
 +          gst_video_overlay_set_window_handle (playsink->overlay_element,
 +              playsink->overlay_handle);
 +        if (playsink->overlay_handle_events_set)
 +          gst_video_overlay_handle_events (playsink->overlay_element,
 +              playsink->overlay_handle_events);
 +        if (playsink->overlay_render_rectangle_set)
 +          gst_video_overlay_set_render_rectangle (playsink->overlay_element,
 +              playsink->overlay_x, playsink->overlay_y,
 +              playsink->overlay_width, playsink->overlay_height);
 +
 +        gst_object_unref (overlay);
          gst_message_unref (message);
 -        gst_x_overlay_prepare_xwindow_id (GST_X_OVERLAY (playsink));
 +        gst_video_overlay_prepare_window_handle (GST_VIDEO_OVERLAY (playsink));
+       } else {
+         GST_BIN_CLASS (gst_play_sink_parent_class)->handle_message (bin,
+             message);
        }
        break;
      }

diff --cc gst/playback/gstplaysinkconvertbin.c
Simple merge

diff --cc sys/ximage/ximagesink.c
index afd38be,7ef200a..916cd45
--- 1/sys/ximage/ximagesink.c
--- 2/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@@ -117,8 -115,10 +117,11 @@@
  
  #include "gst/glib-compat-private.h"
  
+ /* for XkbKeycodeToKeysym */
+ #include <X11/XKBlib.h>
+ 
  GST_DEBUG_CATEGORY_EXTERN (gst_debug_ximagesink);
 +GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE);
  #define GST_CAT_DEFAULT gst_debug_ximagesink
  
  typedef struct

diff --cc sys/xvimage/xvimagesink.c
index 4179633,29fe98c..d63492b
--- 1/sys/xvimage/xvimagesink.c
--- 2/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@@ -132,9 -133,12 +132,12 @@@
  
  #include "gst/glib-compat-private.h"
  
 -GST_DEBUG_CATEGORY_STATIC (gst_debug_xvimagesink);
+ /* for XkbKeycodeToKeysym */
+ #include <X11/XKBlib.h>
+ 
 +GST_DEBUG_CATEGORY_EXTERN (gst_debug_xvimagesink);
 +GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE);
  #define GST_CAT_DEFAULT gst_debug_xvimagesink
 -GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
  
  typedef struct
  {
@@@ -748,28 -1266,23 +752,24 @@@ gst_xvimagesink_handle_xevents (GstXvIm
        case KeyRelease:
          /* Key pressed/released over our window. We send upstream
             events for interactivity/navigation */
-         GST_DEBUG ("xvimagesink key %d pressed over window at %d,%d",
-             e.xkey.keycode, e.xkey.x, e.xkey.y);
          g_mutex_lock (xvimagesink->x_lock);
-         keysym = XKeycodeToKeysym (xvimagesink->xcontext->disp,
-             e.xkey.keycode, 0);
-         g_mutex_unlock (xvimagesink->x_lock);
+         keysym = XkbKeycodeToKeysym (xvimagesink->xcontext->disp,
+             e.xkey.keycode, 0, 0);
          if (keysym != NoSymbol) {
-           char *key_str = NULL;
- 
-           g_mutex_lock (xvimagesink->x_lock);
            key_str = XKeysymToString (keysym);
-           g_mutex_unlock (xvimagesink->x_lock);
-           gst_navigation_send_key_event (GST_NAVIGATION (xvimagesink),
-               e.type == KeyPress ? "key-press" : "key-release", key_str);
          } else {
-           gst_navigation_send_key_event (GST_NAVIGATION (xvimagesink),
-               e.type == KeyPress ? "key-press" : "key-release", "unknown");
+           key_str = "unknown";
          }
+         g_mutex_unlock (xvimagesink->x_lock);
+         GST_DEBUG_OBJECT (xvimagesink,
+             "key %d pressed over window at %d,%d (%s)",
+             e.xkey.keycode, e.xkey.x, e.xkey.y, key_str);
+         gst_navigation_send_key_event (GST_NAVIGATION (xvimagesink),
+             e.type == KeyPress ? "key-press" : "key-release", key_str);
          break;
        default:
 -        GST_DEBUG ("xvimagesink unhandled X event (%d)", e.type);
 +        GST_DEBUG_OBJECT (xvimagesink, "xvimagesink unhandled X event (%d)",
 +            e.type);
      }
      g_mutex_lock (xvimagesink->flow_lock);
      g_mutex_lock (xvimagesink->x_lock);

diff --cc tests/check/elements/videoscale.c
Simple merge

diff --cc win32/common/libgstaudio.def
Simple merge