Merge branch 'master' into 0.11

Conflicts:
	android/apetag.mk
	android/avi.mk
	android/flv.mk
	android/icydemux.mk
	android/id3demux.mk
	android/qtdemux.mk
	android/rtp.mk
	android/rtpmanager.mk
	android/rtsp.mk
	android/soup.mk
	android/udp.mk
	android/wavenc.mk
	android/wavparse.mk
	configure.ac

diff --cc configure.ac
Simple merge

diff --cc ext/jpeg/gstjpegdec.c
Simple merge

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

diff --cc gst/avi/gstavidemux.c
index 60ac62c,e69c08c..6476764
--- 1/gst/avi/gstavidemux.c
--- 2/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@@ -2578,9 -2553,8 +2578,8 @@@ gst_avi_demux_stream_for_id (GstAviDemu
  static gboolean
  gst_avi_demux_parse_index (GstAviDemux * avi, GstBuffer * buf)
  {
-   guint64 pos_before;
    guint8 *data;
 -  guint size;
 +  gsize size;
    guint i, num, n;
    gst_riff_index_entry *index;
    GstClockTime stamp;

diff --cc gst/flv/gstflvdemux.c
index 820f689,3ce7de4..f989dde
--- 1/gst/flv/gstflvdemux.c
--- 2/gst/flv/gstflvdemux.c
+++ b/gst/flv/gstflvdemux.c
@@@ -2423,9 -2452,8 +2452,8 @@@ flv_demux_handle_seek_push (GstFlvDemu
    if (format != GST_FORMAT_TIME)
      goto wrong_format;
  
 -  flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
 +  flush = !!(flags & GST_SEEK_FLAG_FLUSH);
    /* FIXME : the keyframe flag is never used ! */
-   keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT);
  
    /* Work on a copy until we are sure the seek succeeded. */
    memcpy (&seeksegment, &demux->segment, sizeof (GstSegment));
@@@ -2589,9 -2617,8 +2617,8 @@@ gst_flv_demux_handle_seek_pull (GstFlvD
      demux->seeking = seeking;
    GST_OBJECT_UNLOCK (demux);
  
 -  flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
 +  flush = !!(flags & GST_SEEK_FLAG_FLUSH);
    /* FIXME : the keyframe flag is never used */
-   keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT);
  
    if (flush) {
      /* Flush start up and downstream to make sure data flow and loops are

diff --cc gst/imagefreeze/gstimagefreeze.c
index d6a3a9c,080d275..3e122ad
--- 1/gst/imagefreeze/gstimagefreeze.c
--- 2/gst/imagefreeze/gstimagefreeze.c
+++ b/gst/imagefreeze/gstimagefreeze.c
@@@ -608,7 -608,7 +608,7 @@@ gst_image_freeze_src_event (GstPad * pa
            &stop_type, &stop);
        gst_event_unref (event);
  
--      flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
++      flush = !!(flags & GST_SEEK_FLAG_FLUSH);
  
        if (format != GST_FORMAT_TIME && format != GST_FORMAT_DEFAULT) {
          GST_ERROR_OBJECT (pad, "Seek in invalid format: %s",

diff --cc gst/matroska/matroska-demux.c
index aa714f6,4d334b6..ba4ceb2
--- 1/gst/matroska/matroska-demux.c
--- 2/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@@ -2689,8 -2686,8 +2686,8 @@@ gst_matroska_demux_handle_seek_event (G
          entry->pos + demux->ebml_segment_start);
    }
  
--  flush = ! !(flags & GST_SEEK_FLAG_FLUSH);
--  keyunit = ! !(flags & GST_SEEK_FLAG_KEY_UNIT);
++  flush = !!(flags & GST_SEEK_FLAG_FLUSH);
++  keyunit = !!(flags & GST_SEEK_FLAG_KEY_UNIT);
  
    if (flush) {
      GST_DEBUG_OBJECT (demux, "Starting flush");

diff --cc gst/quicktime/qtdemux.c
Simple merge

diff --cc gst/replaygain/Makefile.am
Simple merge

diff --cc gst/rtp/gstrtpbvdepay.c
Simple merge

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

diff --cc gst/videofilter/gstvideobalance.c
Simple merge

diff --cc gst/videofilter/gstvideoflip.c
Simple merge

diff --cc gst/videomixer/gstcollectpads2.c
index 058a064,8ac21d3..df8dd51
--- 1/gst/videomixer/gstcollectpads2.c
--- 2/gst/videomixer/gstcollectpads2.c
+++ b/gst/videomixer/gstcollectpads2.c
@@@ -1198,7 -1198,7 +1198,7 @@@ gst_collect_pads2_set_waiting (GstColle
    /* Do something only on a change and if not locked */
    if (!GST_COLLECT_PADS2_STATE_IS_SET (data, GST_COLLECT_PADS2_STATE_LOCKED) &&
        (GST_COLLECT_PADS2_STATE_IS_SET (data, GST_COLLECT_PADS2_STATE_WAITING) !=
--          ! !waiting)) {
++          !!waiting)) {
      /* Set waiting state for this pad */
      if (waiting)
        GST_COLLECT_PADS2_STATE_SET (data, GST_COLLECT_PADS2_STATE_WAITING);

diff --cc sys/oss4/oss4-mixer-slider.c
Simple merge