Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
	gst-libs/gst/audio/Makefile.am
	gst-libs/gst/audio/audio.h
	tests/examples/seek/jsseek.c
	tests/examples/seek/seek.c
	tests/icles/test-colorkey.c

diff --cc configure.ac
Simple merge

diff --cc gst-libs/gst/audio/audio.h
index c60c5d2,ed282fa..60421ad
--- 1/gst-libs/gst/audio/audio.h
--- 2/gst-libs/gst/audio/audio.h
+++ b/gst-libs/gst/audio/audio.h
@@@ -287,13 -248,10 +287,15 @@@ struct _GstAudioInfo 
    gint                      channels;
    gint                      bpf;
    GstAudioChannelPosition   position[64];
 +
 +  /*< private >*/
 +  gpointer _gst_reserved[GST_PADDING];
  };
  
 +GType gst_audio_info_get_type        (void);
 +
+ #define GST_AUDIO_INFO_IS_VALID(i)           ((i)->finfo != NULL && (i)->rate > 0 && (i)->channels > 0 && (i)->bpf > 0)
+ 
  #define GST_AUDIO_INFO_FORMAT(i)             (GST_AUDIO_FORMAT_INFO_FORMAT((i)->finfo))
  #define GST_AUDIO_INFO_NAME(i)               (GST_AUDIO_FORMAT_INFO_NAME((i)->finfo))
  #define GST_AUDIO_INFO_WIDTH(i)              (GST_AUDIO_FORMAT_INFO_WIDTH((i)->finfo))

diff --cc gst-libs/gst/audio/gstaudiodecoder.c
index 2bd7de8,5e2c631..012ccf5
--- 1/gst-libs/gst/audio/gstaudiodecoder.c
--- 2/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/gst-libs/gst/audio/gstaudiodecoder.c
@@@ -742,10 -721,13 +742,13 @@@ gst_audio_decoder_finish_frame (GstAudi
  
    priv = dec->priv;
    ctx = &dec->priv->ctx;
 +  size = buf ? gst_buffer_get_size (buf) : 0;
  
+   /* must know the output format by now */
+   g_return_val_if_fail (GST_AUDIO_INFO_IS_VALID (&ctx->info), GST_FLOW_ERROR);
+ 
    GST_LOG_OBJECT (dec, "accepting %d bytes == %d samples for %d frames",
 -      buf ? GST_BUFFER_SIZE (buf) : -1,
 -      buf ? GST_BUFFER_SIZE (buf) / ctx->info.bpf : -1, frames);
 +      buf ? size : -1, buf ? size / ctx->info.bpf : -1, frames);
  
    GST_AUDIO_DECODER_STREAM_LOCK (dec);
  

diff --cc tests/examples/seek/jsseek.c
index 3329d56,ab2bfc3..209a472
--- 1/tests/examples/seek/jsseek.c
--- 2/tests/examples/seek/jsseek.c
+++ b/tests/examples/seek/jsseek.c
@@@ -50,23 -50,10 +50,8 @@@
  GST_DEBUG_CATEGORY_STATIC (seek_debug);
  #define GST_CAT_DEFAULT (seek_debug)
  
- #if (!GTK_CHECK_VERSION(2, 23, 0) || GTK_CHECK_VERSION(2, 90, 0)) && !GTK_CHECK_VERSION(2, 91, 1)
- #define gtk_combo_box_text_new gtk_combo_box_new_text
- #define gtk_combo_box_text_append_text gtk_combo_box_append_text
- #define gtk_combo_box_text_remove gtk_combo_box_remove_text
- #define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
- #endif
- 
- #if !GTK_CHECK_VERSION (2, 17, 7)
- static void
- gtk_widget_get_allocation (GtkWidget * w, GtkAllocation * a)
- {
-   *a = w->allocation;
- }
- #endif
- 
  /* configuration */
 -
 -//#define SOURCE "filesrc"
 -#define SOURCE "gnomevfssrc"
 +#define SOURCE "filesrc"
  
  #define ASINK "alsasink"
  //#define ASINK "osssink"

diff --cc tests/examples/seek/seek.c
index 50a560d,b04967b..dd432df
--- 1/tests/examples/seek/seek.c
--- 2/tests/examples/seek/seek.c
+++ b/tests/examples/seek/seek.c
@@@ -39,15 -39,8 +39,8 @@@
  #include <gdk/gdkwin32.h>
  #endif
  
 -#include <gst/interfaces/xoverlay.h>
 +#include <gst/interfaces/videooverlay.h>
  
- #if (!GTK_CHECK_VERSION(2, 23, 0) || GTK_CHECK_VERSION(2, 90, 0)) && !GTK_CHECK_VERSION(2, 91, 1)
- #define gtk_combo_box_text_new gtk_combo_box_new_text
- #define gtk_combo_box_text_append_text gtk_combo_box_append_text
- #define gtk_combo_box_text_remove gtk_combo_box_remove_text
- #define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
- #endif
- 
  GST_DEBUG_CATEGORY_STATIC (seek_debug);
  #define GST_CAT_DEFAULT (seek_debug)
  

diff --cc tests/icles/test-colorkey.c
index ad5db92,ac04ba5..fca374e
--- 1/tests/icles/test-colorkey.c
--- 2/tests/icles/test-colorkey.c
+++ b/tests/icles/test-colorkey.c
@@@ -31,17 -31,9 +31,9 @@@
  #include <gtk/gtk.h>
  
  #include <gst/gst.h>
 -#include <gst/interfaces/xoverlay.h>
 +#include <gst/interfaces/videooverlay.h>
  #include <gst/interfaces/propertyprobe.h>
  
- #if !GTK_CHECK_VERSION (2, 17, 7)
- static void
- gtk_widget_get_allocation (GtkWidget * w, GtkAllocation * a)
- {
-   *a = w->allocation;
- }
- #endif
- 
  static GtkWidget *video_window = NULL;
  static GstElement *sink = NULL;
  static gulong embed_xid = 0;

diff --cc tests/icles/test-videooverlay.c
index 400d0ac,9ef552e..b425f0f
--- 1/tests/icles/test-videooverlay.c
--- 2/tests/icles/test-xoverlay.c
+++ b/tests/icles/test-videooverlay.c
@@@ -32,17 -32,9 +32,9 @@@
  #include <gtk/gtk.h>
  
  #include <gst/gst.h>
 -#include <gst/interfaces/xoverlay.h>
 +#include <gst/interfaces/videooverlay.h>
  #include <gst/video/gstvideosink.h>
  
- #if !GTK_CHECK_VERSION (2, 17, 7)
- static void
- gtk_widget_get_allocation (GtkWidget * w, GtkAllocation * a)
- {
-   *a = w->allocation;
- }
- #endif
- 
  static struct
  {
    gint w, h;
@@@ -126,12 -113,10 +113,10 @@@ handle_draw_cb (GtkWidget * widget, cai
  
    cairo_fill (cr);
  
-   cairo_destroy (cr);
- 
    if (verbose) {
-     g_print ("expose(%p)\n", widget);
+     g_print ("draw(%p)\n", widget);
    }
 -  gst_x_overlay_expose (anim_state.overlay);
 +  gst_video_overlay_expose (anim_state.overlay);
    return FALSE;
  }