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

Conflicts:
	tests/examples/camerabin2/Makefile.am

diff --cc gst-libs/gst/video/gstbasevideocodec.c
Simple merge

diff --cc gst/camerabin2/gstcamerabin2.c
Simple merge

diff --cc tests/examples/camerabin2/Makefile.am
index 807a229,4431e94..c92f95c
--- 1/tests/examples/camerabin2/Makefile.am
--- 2/tests/examples/camerabin2/Makefile.am
+++ b/tests/examples/camerabin2/Makefile.am
@@@ -15,7 -15,7 +15,7 @@@ gst_camera2_LDADD   = 
          $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \
          $(GST_PLUGINS_BASE_LIBS) \
          -lgstinterfaces-@GST_MAJORMINOR@ \
-         -lgstvideo-@GST_MAJORMINOR@ \
 -      -lgstpbutils-@GST_MAJORMINOR@ \
++        -lgstpbutils-@GST_MAJORMINOR@ \
          $(GST_LIBS) \
        $(GTK_LIBS) \
        $(GMODULE_EXPORT_LIBS)

diff --cc tests/examples/camerabin2/gst-camera2.c
index c8cc8dc,13299ea..a6610c8
--- 1/tests/examples/camerabin2/gst-camera2.c
--- 2/tests/examples/camerabin2/gst-camera2.c
+++ b/tests/examples/camerabin2/gst-camera2.c
@@@ -31,8 -31,11 +31,11 @@@
  
  #include "gst-camera2.h"
  
+ #include <string.h>
+ 
+ #include <gst/pbutils/encoding-profile.h>
  #include <gst/gst.h>
 -#include <gst/interfaces/xoverlay.h>
 +#include <gst/video/videooverlay.h>
  #include <gtk/gtk.h>
  #include <gdk/gdkx.h>
  #include <gdk/gdkkeysyms.h>
@@@ -41,6 -44,78 +44,78 @@@
  
  static GstElement *camera;
  static GtkBuilder *builder;
 -      gst_caps_new_simple ("application/ogg", NULL), NULL);
+ static GtkWidget *ui_main_window;
+ 
+ typedef struct
+ {
+   const gchar *name;
+   GstEncodingProfile *(*create_profile) ();
+ } GstCameraVideoFormat;
+ 
+ static GstEncodingProfile *
+ create_ogg_profile (void)
+ {
+   GstEncodingContainerProfile *container;
+ 
+   container = gst_encoding_container_profile_new ("ogg", NULL,
 -      gst_encoding_video_profile_new (gst_caps_new_simple ("video/x-theora",
 -              NULL), NULL, NULL, 1));
++      gst_caps_new_empty_simple ("application/ogg"), NULL);
+ 
+   gst_encoding_container_profile_add_profile (container, (GstEncodingProfile *)
 -      gst_encoding_audio_profile_new (gst_caps_new_simple ("audio/x-vorbis",
 -              NULL), NULL, NULL, 1));
++      gst_encoding_video_profile_new (gst_caps_new_empty_simple
++          ("video/x-theora"), NULL, NULL, 1));
+   gst_encoding_container_profile_add_profile (container, (GstEncodingProfile *)
 -      gst_caps_new_simple ("video/webm", NULL), NULL);
++      gst_encoding_audio_profile_new (gst_caps_new_empty_simple
++          ("audio/x-vorbis"), NULL, NULL, 1));
+ 
+   return (GstEncodingProfile *) container;
+ }
+ 
+ static GstEncodingProfile *
+ create_webm_profile (void)
+ {
+   GstEncodingContainerProfile *container;
+ 
+   container = gst_encoding_container_profile_new ("webm", NULL,
 -      gst_encoding_video_profile_new (gst_caps_new_simple ("video/x-vp8", NULL),
++      gst_caps_new_empty_simple ("video/webm"), NULL);
+ 
+   gst_encoding_container_profile_add_profile (container, (GstEncodingProfile *)
 -      gst_encoding_audio_profile_new (gst_caps_new_simple ("audio/x-vorbis",
 -              NULL), NULL, NULL, 1));
++      gst_encoding_video_profile_new (gst_caps_new_empty_simple ("video/x-vp8"),
+           NULL, NULL, 1));
+   gst_encoding_container_profile_add_profile (container, (GstEncodingProfile *)
 -      gst_encoding_video_profile_new (gst_caps_new_simple ("video/x-h264",
 -              NULL), NULL, NULL, 1));
++      gst_encoding_audio_profile_new (gst_caps_new_empty_simple
++          ("audio/x-vorbis"), NULL, NULL, 1));
+ 
+   return (GstEncodingProfile *) container;
+ }
+ 
+ static GstEncodingProfile *
+ create_mp4_profile (void)
+ {
+   GstEncodingContainerProfile *container;
+ 
+   container = gst_encoding_container_profile_new ("mp4", NULL,
+       gst_caps_new_simple ("video/quicktime", "variant", G_TYPE_STRING, "iso",
+           NULL), NULL);
+ 
+   gst_encoding_container_profile_add_profile (container, (GstEncodingProfile *)
++      gst_encoding_video_profile_new (gst_caps_new_empty_simple
++          ("video/x-h264"), NULL, NULL, 1));
+   gst_encoding_container_profile_add_profile (container, (GstEncodingProfile *)
+       gst_encoding_audio_profile_new (gst_caps_new_simple ("audio/mpeg",
+               "version", G_TYPE_INT, 4, NULL), NULL, NULL, 1));
+ 
+   return (GstEncodingProfile *) container;
+ }
+ 
+ GstCameraVideoFormat formats[] = {
+   {"ogg (theora/vorbis)", create_ogg_profile}
+   ,
+   {"webm (vp8/vorbis)", create_webm_profile}
+   ,
+   {"mp4 (h264+aac)", create_mp4_profile}
+   ,
+   {NULL, NULL}
+ };
  
  void
  on_mainWindow_delete_event (GtkWidget * widget, GdkEvent * event, gpointer data)