Merge branch 'master' into 0.11

Conflicts:
	ext/wavpack/gstwavpackparse.c
	sys/v4l2/gstv4l2bufferpool.c
	sys/v4l2/gstv4l2bufferpool.h
	sys/v4l2/gstv4l2videooverlay.c

diff --cc ext/jack/gstjack.h
Simple merge

diff --cc ext/jack/gstjackaudioclient.c
Simple merge

diff --cc ext/jack/gstjackaudiosink.c
Simple merge

diff --cc ext/jack/gstjackaudiosink.h
Simple merge

diff --cc ext/jack/gstjackaudiosrc.c
Simple merge

diff --cc ext/jack/gstjackaudiosrc.h
Simple merge

diff --cc ext/wavpack/gstwavpackdec.c
Simple merge

diff --cc ext/wavpack/gstwavpackenc.c
Simple merge

diff --cc ext/wavpack/gstwavpackparse.c
index 5ffa7a5,e3625c5..0af0a90
--- 1/ext/wavpack/gstwavpackparse.c
--- 2/ext/wavpack/gstwavpackparse.c
+++ b/ext/wavpack/gstwavpackparse.c
@@@ -1038,8 -1007,7 +1006,7 @@@ gst_wavpack_parse_find_marker (guint8 
  static GstFlowReturn
  gst_wavpack_parse_resync_loop (GstWavpackParse * parse, WavpackHeader * header)
  {
 -  GstFlowReturn flow_ret = GST_FLOW_UNEXPECTED;
 +  GstFlowReturn flow_ret = GST_FLOW_EOS;
- 
    GstBuffer *buf = NULL;
  
    /* loop until we have a frame header or reach the end of the stream */

diff --cc gst/avi/gstavimux.c
Simple merge

diff --cc sys/v4l2/gstv4l2videooverlay.c
index 702c1a5,f1c4d51..ae9a317
--- 1/sys/v4l2/gstv4l2videooverlay.c
--- 2/sys/v4l2/gstv4l2xoverlay.c
+++ b/sys/v4l2/gstv4l2videooverlay.c
@@@ -322,8 -324,8 +324,8 @@@ event_refresh (gpointer data
              break;
            case KeyPress:
            case KeyRelease:
 -            g_mutex_lock (v4l2xv->mutex);
 +            g_mutex_lock (&v4l2xv->mutex);
-             keysym = XKeycodeToKeysym (v4l2xv->dpy, e.xkey.keycode, 0);
+             keysym = XkbKeycodeToKeysym (v4l2xv->dpy, e.xkey.keycode, 0, 0);
              if (keysym != NoSymbol) {
                key_str = XKeysymToString (keysym);
              } else {