Merge branch 'master' into 0.11

Conflicts:
	gst/gstpad.h

diff --combined gst/gstclock.h
index a94b3a5,230e190..2bc9d80
--- 1/gst/gstclock.h
--- 2/gst/gstclock.h
+++ b/gst/gstclock.h
@@@ -205,15 -205,22 +205,22 @@@ G_STMT_START {                                          
  /**
   * GST_TIME_FORMAT:
   *
-  * A format that can be used in printf like format strings to format
-  * a #GstClockTime value.
+  * A string that can be used in printf-like format strings to display a
+  * #GstClockTime value in h:m:s format.  Use GST_TIME_ARGS() to construct
+  * the matching arguments.
+  *
+  * Example:
+  * |[
+  * printf("%" GST_TIME_FORMAT "\n", GST_TIME_ARGS(ts));
+  * ]|
   */
  #define GST_TIME_FORMAT "u:%02u:%02u.%09u"
  /**
   * GST_TIME_ARGS:
   * @t: a #GstClockTime
   *
-  * Format @t for the GST_TIME_FORMAT format string.
+  * Format @t for the #GST_TIME_FORMAT format string. Note: @t will be
+  * evaluated more than once.
   */
  #define GST_TIME_ARGS(t) \
          GST_CLOCK_TIME_IS_VALID (t) ? \
@@@ -407,7 -414,7 +414,7 @@@ typedef enum 
   * @tv: a #GTimeVal to wait.
   *
   * Wait on the clock until the entries changed or the specified timeout
-  * occurred. 
+  * occurred.
   */
  #define GST_CLOCK_TIMED_WAIT(clock,tv)   g_cond_timed_wait(GST_CLOCK_COND(clock),GST_OBJECT_GET_LOCK(clock),tv)
  /**
@@@ -430,7 -437,7 +437,7 @@@ struct _GstClock 
    GMutex      *slave_lock; /* order: SLAVE_LOCK, OBJECT_LOCK */
  
    /*< protected >*/ /* with LOCK */
-   GstClockTime         internal_calibration; 
+   GstClockTime         internal_calibration;
    GstClockTime         external_calibration;
    GstClockTime         rate_numerator;
    GstClockTime         rate_denominator;
@@@ -468,11 -475,12 +475,11 @@@
   *                     be acceptable. The new resolution should be returned.
   * @get_resolution: get the resolution of the clock.
   * @get_internal_time: get the internal unadjusted time of the clock.
 - * @wait: perform a blocking wait for the given #GstClockEntry. Deprecated,
   *        implement @wait_jitter instead.
 + * @wait: perform a blocking wait on the given #GstClockEntry and return
 + *               the jitter.
   * @wait_async: perform an asynchronous wait for the given #GstClockEntry.
   * @unschedule: unblock a blocking or async wait operation.
 - * @wait_jitter: perform a blocking wait on the given #GstClockEntry and return
 - *               the jitter. (Since: 0.10.10)
   *
   * GStreamer clock class. Override the vmethods to implement the clock
   * functionality.
@@@ -490,13 -498,15 +497,13 @@@ struct _GstClockClass 
    GstClockTime                (*get_internal_time)    (GstClock *clock);
  
    /* waiting on an ID */
 -  GstClockReturn        (*wait)                       (GstClock *clock, GstClockEntry *entry);
 +  GstClockReturn        (*wait)                 (GstClock *clock, GstClockEntry *entry,
 +                                               GstClockTimeDiff *jitter);
    GstClockReturn        (*wait_async)           (GstClock *clock, GstClockEntry *entry);
    void                  (*unschedule)         (GstClock *clock, GstClockEntry *entry);
  
 -  /* ABI added to replace the deprecated wait */
 -  GstClockReturn        (*wait_jitter)                (GstClock *clock, GstClockEntry *entry,
 -                                               GstClockTimeDiff *jitter);
    /*< private >*/
 -  gpointer _gst_reserved[GST_PADDING - 1];
 +  gpointer _gst_reserved[GST_PADDING];
  };
  
  GType                 gst_clock_get_type              (void);
@@@ -518,7 -528,7 +525,7 @@@ void                       gst_clock_get_calibration       (GstCl
  /* master/slave clocks */
  gboolean              gst_clock_set_master            (GstClock *clock, GstClock *master);
  GstClock*             gst_clock_get_master            (GstClock *clock);
- gboolean              gst_clock_add_observation       (GstClock *clock, GstClockTime slave, 
+ gboolean              gst_clock_add_observation       (GstClock *clock, GstClockTime slave,
                                                         GstClockTime master, gdouble *r_squared);