[gstreamermm/devel-other-plugins: 6/10] Merge branch 'master' into devel-other-plugins

[Marcin Kolny <mkolny src gnome org>]

commit 2130ed28271476bc4e7730913aa7ec21e4230059
Merge: e56b9c4 c7e3ab7
Author: Marcin Kolny <marcin kolny flytronic pl>
Date:   Thu Jul 23 09:39:01 2015 +0200

    Merge branch 'master' into devel-other-plugins
    
    Conflicts:
        gstreamer/src/basesink.hg
        gstreamer/src/basesrc.hg

 gstreamer/src/allocator.hg       |    4 +-
 gstreamer/src/audioringbuffer.hg |    2 +-
 gstreamer/src/basesink.hg        |   29 ++++++++++---------
 gstreamer/src/basesrc.hg         |    9 +++---
 gstreamer/src/basetransform.hg   |    2 +-
 gstreamer/src/clock.hg           |   50 +++++++++++++++++-----------------
 gstreamer/src/colorbalance.hg    |   28 +++++++++---------
 gstreamer/src/discoverer.hg      |    6 ++--
 gstreamer/src/discovererinfo.hg  |   40 ++++++++++++++--------------
 gstreamer/src/event.hg           |   14 +++++-----
 gstreamer/src/message.hg         |    4 +-
 gstreamer/src/object.hg          |    7 +---
 gstreamer/src/taglist.hg         |    2 +-
 gstreamer/src/urihandler.hg      |    4 +-
 gstreamer/src/videoframe.hg      |   12 ++++----
 gstreamer/src/videoinfo.hg       |    2 +-
 tools/m4/convert_gst.m4          |   55 +++++++++++++++++++------------------
 17 files changed, 135 insertions(+), 135 deletions(-)
---