Merge branch 'master' into 0.11

Conflicts:
	ext/wavpack/gstwavpackenc.c
	tests/check/elements/audioiirfilter.c
	tests/examples/v4l2/probe.c

diff --cc ext/annodex/gstannodex.c
Simple merge

diff --cc ext/pulse/pulseprobe.c
Simple merge

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

diff --cc ext/wavpack/gstwavpackenc.c
index c871772,8595798..0d2515f
--- 1/ext/wavpack/gstwavpackenc.c
--- 2/ext/wavpack/gstwavpackenc.c
+++ b/ext/wavpack/gstwavpackenc.c
@@@ -799,13 -732,11 +735,11 @@@ gst_wavpack_enc_handle_frame (GstAudioE
      } else if ((enc->srcpad_last_return == GST_FLOW_NOT_LINKED) &&
          (enc->wvcsrcpad_last_return == GST_FLOW_NOT_LINKED)) {
        ret = GST_FLOW_NOT_LINKED;
 -    } else if ((enc->srcpad_last_return == GST_FLOW_WRONG_STATE) &&
 -        (enc->wvcsrcpad_last_return == GST_FLOW_WRONG_STATE)) {
 -      ret = GST_FLOW_WRONG_STATE;
 +    } else if ((enc->srcpad_last_return == GST_FLOW_FLUSHING) &&
 +        (enc->wvcsrcpad_last_return == GST_FLOW_FLUSHING)) {
 +      ret = GST_FLOW_FLUSHING;
      } else {
-       GST_ELEMENT_ERROR (enc, LIBRARY, ENCODE, (NULL),
-           ("encoding samples failed"));
-       ret = GST_FLOW_ERROR;
+       goto encoding_failed;
      }
    }
  

diff --cc gst/audiofx/audiofirfilter.c
Simple merge

diff --cc gst/audiofx/audioiirfilter.c
Simple merge

diff --cc gst/interleave/interleave.c
Simple merge

diff --cc gst/rtpmanager/rtpsession.c
Simple merge

diff --cc gst/udp/gstdynudpsink.c
Simple merge

diff --cc gst/udp/gstmultiudpsink.c
Simple merge

diff --cc sys/v4l2/gstv4l2object.c
Simple merge

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

diff --cc tests/examples/pulse/pulse.c
index c823163,a0bd3b3..f1d5b26
--- 1/tests/examples/pulse/pulse.c
--- 2/tests/examples/pulse/pulse.c
+++ b/tests/examples/pulse/pulse.c
@@@ -17,9 -17,12 +17,13 @@@
   * Boston, MA 02111-1307, USA.
   */
  
+ /* FIXME 0.11: suppress warnings for deprecated API such as GValueArray
+  * with newer GLib versions (>= 2.31.0) */
+ #define GLIB_DISABLE_DEPRECATION_WARNINGS
+ 
  #include <gst/gst.h>
  
 +#if 0
  #include <gst/interfaces/propertyprobe.h>
  
  static void

diff --cc tests/examples/rtp/server-alsasrc-PCMA.c
Simple merge

diff --cc tests/icles/test-oss4.c
Simple merge