Merge branch 'master' into 0.11

Conflicts:
	tests/check/gst/struct_x86_64.h

tests/check/gst/struct_x86_64.h

@@ -1,63 +1,83 @@
 static GstCheckABIStruct list[] = {
-  {"GstBin", sizeof (GstBin), 336},
+  {"GstAllocTrace", sizeof (GstAllocTrace), 24},
   {"GstBinClass", sizeof (GstBinClass), 568},
+  {"GstBin", sizeof (GstBin), 336},
+  {"GstBufferClass", sizeof (GstBufferClass), 32},
   {"GstBuffer", sizeof (GstBuffer), 120},
-  {"GstBus", sizeof (GstBus), 152} ,
   {"GstBusClass", sizeof (GstBusClass), 288},
+  {"GstBus", sizeof (GstBus), 152},
   {"GstCaps", sizeof (GstCaps), 56},
-  {"GstStaticCaps", sizeof (GstStaticCaps), 96} ,
   {"GstChildProxyInterface", sizeof (GstChildProxyInterface), 80},
-  {"GstClock", sizeof (GstClock), 240} ,
   {"GstClockClass", sizeof (GstClockClass), 320},
-  {"GstElement", sizeof (GstElement), 232} ,
+  {"GstClockEntry", sizeof (GstClockEntry), 80},
+  {"GstClock", sizeof (GstClock), 240},
+  {"GstDebugCategory", sizeof (GstDebugCategory), 24},
   {"GstElementClass", sizeof (GstElementClass), 488},
-  {"GstElementFactory", sizeof (GstElementFactory), 280} ,
+  {"GstElementDetails", sizeof (GstElementDetails), 64},
   {"GstElementFactoryClass", sizeof (GstElementFactoryClass), 304},
+  {"GstElementFactory", sizeof (GstElementFactory), 280},
+  {"GstElement", sizeof (GstElement), 232},
+  {"GstEventClass", sizeof (GstEventClass), 64},
   {"GstEvent", sizeof (GstEvent), 64},
   {"GstFormatDefinition", sizeof (GstFormatDefinition), 32},
+  {"GstGhostPadClass", sizeof (GstGhostPadClass), 344},
+  {"GstGhostPad", sizeof (GstGhostPad), 384},
+  {"GstImplementsInterfaceClass", sizeof (GstImplementsInterfaceClass), 56},
+  {"GstIndexAssociation", sizeof (GstIndexAssociation), 16},
+  {"GstIndexClass", sizeof (GstIndexClass), 312},
   {"GstIndexEntry", sizeof (GstIndexEntry), 32},
+  {"GstIndexFactoryClass", sizeof (GstIndexFactoryClass), 304},
+  {"GstIndexFactory", sizeof (GstIndexFactory), 192},
   {"GstIndexGroup", sizeof (GstIndexGroup), 24},
   {"GstIndex", sizeof (GstIndex), 192},
-  {"GstIndexClass", sizeof (GstIndexClass), 312} ,
-  {"GstIndexAssociation", sizeof (GstIndexAssociation), 16} ,
-  {"GstIndexFactory", sizeof (GstIndexFactory), 192} ,
-  {"GstIndexFactoryClass", sizeof (GstIndexFactoryClass), 304} ,
-  {"GstDebugCategory", sizeof (GstDebugCategory), 24} ,
-  {"GstImplementsInterfaceClass", sizeof (GstImplementsInterfaceClass), 56} ,
   {"GstIterator", sizeof (GstIterator), 104},
+  {"GstMessageClass", sizeof (GstMessageClass), 64},
   {"GstMessage", sizeof (GstMessage), 104},
+  {"GstMiniObjectClass", sizeof (GstMiniObjectClass), 32},
   {"GstMiniObject", sizeof (GstMiniObject), 24},
-  {"GstObject", sizeof (GstObject), 80} ,
   {"GstObjectClass", sizeof (GstObjectClass), 240},
-  {"GstPad", sizeof (GstPad), 368} ,
+  {"GstObject", sizeof (GstObject), 80},
   {"GstPadClass", sizeof (GstPadClass), 304},
-  {"GstPadTemplate", sizeof (GstPadTemplate), 136} ,
+  {"GstPad", sizeof (GstPad), 368},
   {"GstPadTemplateClass", sizeof (GstPadTemplateClass), 280},
-  {"GstStaticPadTemplate", sizeof (GstStaticPadTemplate), 112} ,
+  {"GstPadTemplate", sizeof (GstPadTemplate), 136},
-  {"GstPipeline", sizeof (GstPipeline), 392} ,
+  {"GstPadTemplate", sizeof (GstPadTemplate), 136},
+  {"GstParamSpecFraction", sizeof (GstParamSpecFraction), 96},
+  {"GstParamSpecMiniObject", sizeof (GstParamSpecMiniObject), 72},
   {"GstPipelineClass", sizeof (GstPipelineClass), 600},
-  {"GstPlugin", sizeof (GstPlugin), 280} ,
+  {"GstPipeline", sizeof (GstPipeline), 392},
   {"GstPluginClass", sizeof (GstPluginClass), 272},
   {"GstPluginDesc", sizeof (GstPluginDesc), 104},
-  {"GstPluginFeature", sizeof (GstPluginFeature), 144} ,
   {"GstPluginFeatureClass", sizeof (GstPluginFeatureClass), 272},
-  {"GstQueryTypeDefinition", sizeof (GstQueryTypeDefinition), 32} ,
+  {"GstPluginFeature", sizeof (GstPluginFeature), 144},
+  {"GstPlugin", sizeof (GstPlugin), 280},
+  {"GstPresetInterface", sizeof (GstPresetInterface), 112},
+  {"GstProxyPadClass", sizeof (GstProxyPadClass), 312},
+  {"GstProxyPad", sizeof (GstProxyPad), 376},
+  {"GstQueryClass", sizeof (GstQueryClass), 64},
   {"GstQuery", sizeof (GstQuery), 48},
-  {"GstRegistry", sizeof (GstRegistry), 144} ,
+  {"GstQueryTypeDefinition", sizeof (GstQueryTypeDefinition), 32},
   {"GstRegistryClass", sizeof (GstRegistryClass), 288},
+  {"GstRegistry", sizeof (GstRegistry), 144},
   {"GstSegment", sizeof (GstSegment), 104},
+  {"GstStaticCaps", sizeof (GstStaticCaps), 96},
+  {"GstStaticPadTemplate", sizeof (GstStaticPadTemplate), 112},
   {"GstStructure", sizeof (GstStructure), 40},
-  {"GstSystemClock", sizeof (GstSystemClock), 288} ,
   {"GstSystemClockClass", sizeof (GstSystemClockClass), 352},
+  {"GstSystemClock", sizeof (GstSystemClock), 288},
+  {"GstTagList", sizeof (GstTagList), 40},
   {"GstTagSetterIFace", sizeof (GstTagSetterIFace), 16},
-  {"GstTask", sizeof (GstTask), 160} ,
   {"GstTaskClass", sizeof (GstTaskClass), 280},
-  {"GstTrace", sizeof (GstTrace), 32} ,
+  {"GstTask", sizeof (GstTask), 160},
+  {"GstTaskPoolClass", sizeof (GstTaskPoolClass), 304},
+  {"GstTaskPool", sizeof (GstTaskPool), 120},
+  {"GstTaskThreadCallbacks", sizeof (GstTaskThreadCallbacks), 48},
   {"GstTraceEntry", sizeof (GstTraceEntry), 128},
-  {"GstAllocTrace", sizeof (GstAllocTrace), 24} ,
+  {"GstTrace", sizeof (GstTrace), 32},
-  {"GstTypeFind", sizeof (GstTypeFind), 64} ,
-  {"GstTypeFindFactory", sizeof (GstTypeFindFactory), 216} ,
   {"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 304},
+  {"GstTypeFindFactory", sizeof (GstTypeFindFactory), 216},
+  {"GstTypeFind", sizeof (GstTypeFind), 64},
+  {"GstTypeNameData", sizeof (GstTypeNameData), 16},
   {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 88},
   {"GstValueTable", sizeof (GstValueTable), 64},
 #if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED)

tests/check/libs/libsabi.c

@@ -26,10 +26,18 @@
 #include <gst/base/gstbasesink.h>
 #include <gst/base/gstbasesrc.h>
 #include <gst/base/gstbasetransform.h>
+#include <gst/base/gstbitreader.h>
+#include <gst/base/gstbytereader.h>
+#include <gst/base/gstbytewriter.h>
 #include <gst/base/gstcollectpads.h>
+#include <gst/base/gstdataqueue.h>
 #include <gst/base/gstpushsrc.h>
 #include <gst/base/gsttypefindhelper.h>
 #include <gst/controller/gstcontroller.h>
+#include <gst/controller/gstcontrolsource.h>
+#include <gst/controller/gstinterpolationcontrolsource.h>
+#include <gst/controller/gstlfocontrolsource.h>
+#include <gst/dataprotocol/dataprotocol.h>
 #include <gst/net/gstnet.h>
 #include <gst/net/gstnetclientclock.h>
 #include <gst/net/gstnettimepacket.h>

tests/check/libs/struct_x86_64.h

@@ -1,47 +1,40 @@
-static GstCheckABIStruct list[] = {
+
-  {"GstAdapter", sizeof (GstAdapter), 88}
+GstCheckABIStruct list[] = {
-  ,
+  {"GstAdapterClass", sizeof (GstAdapterClass), 168},
-  {"GstAdapterClass", sizeof (GstAdapterClass), 168}
+  {"GstAdapter", sizeof (GstAdapter), 88},
-  ,
+  {"GstBaseSinkClass", sizeof (GstBaseSinkClass), 728},
-  {"GstBaseSink", sizeof (GstBaseSink), 600}
+  {"GstBaseSink", sizeof (GstBaseSink), 600},
-  ,
+  {"GstBaseSrcClass", sizeof (GstBaseSrcClass), 744},
-  {"GstBaseSinkClass", sizeof (GstBaseSinkClass), 728}
+  {"GstBaseSrc", sizeof (GstBaseSrc), 600},
-  ,
+  {"GstBaseTransformClass", sizeof (GstBaseTransformClass), 744},
-  {"GstBaseSrc", sizeof (GstBaseSrc), 600}
+  {"GstBaseTransform", sizeof (GstBaseTransform), 576},
-  ,
+  {"GstBitReader", sizeof (GstBitReader), 24},
-  {"GstBaseSrcClass", sizeof (GstBaseSrcClass), 744}
+  {"GstByteReader", sizeof (GstByteReader), 16},
-  ,
+  {"GstByteWriter", sizeof (GstByteWriter), 32},
-  {"GstBaseTransform", sizeof (GstBaseTransform), 576}
+  {"GstCollectData", sizeof (GstCollectData), 168},
-  ,
+  {"GstCollectPadsClass", sizeof (GstCollectPadsClass), 272},
-  {"GstBaseTransformClass", sizeof (GstBaseTransformClass), 744}
+  {"GstCollectPads", sizeof (GstCollectPads), 168},
-  ,
+  {"GstControllerClass", sizeof (GstControllerClass), 168},
-  {"GstCollectData", sizeof (GstCollectData), 168}
+  {"GstController", sizeof (GstController), 80},
-  ,
+  {"GstControlSourceClass", sizeof (GstControlSourceClass), 176},
-  {"GstCollectPads", sizeof (GstCollectPads), 168}
+  {"GstControlSource", sizeof (GstControlSource), 80},
-  ,
+  {"GstDataQueueClass", sizeof (GstDataQueueClass), 184},
-  {"GstCollectPadsClass", sizeof (GstCollectPadsClass), 272}
+  {"GstDataQueueItem", sizeof (GstDataQueueItem), 40},
-  ,
+  {"GstDataQueue", sizeof (GstDataQueue), 128},
-  {"GstPushSrc", sizeof (GstPushSrc), 632}
+  {"GstDataQueueSize", sizeof (GstDataQueueSize), 16},
-  ,
+  {"GstDPPacketizer", sizeof (GstDPPacketizer), 64},
-  {"GstPushSrcClass", sizeof (GstPushSrcClass), 784}
+  {"GstInterpolationControlSourceClass", sizeof (GstInterpolationControlSourceClass), 208},
-  ,
+  {"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 128},
-  {"GstTimedValue", sizeof (GstTimedValue), 32}
+  {"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 208},
-  ,
+  {"GstLFOControlSource", sizeof (GstLFOControlSource), 128},
-  {"GstValueArray", sizeof (GstValueArray), 32}
+  {"GstNetClientClockClass", sizeof (GstNetClientClockClass), 384},
-  ,
+  {"GstNetClientClock", sizeof (GstNetClientClock), 368},
-  {"GstController", sizeof (GstController), 80}
+  {"GstNetTimePacket", sizeof (GstNetTimePacket), 16},
-  ,
+  {"GstNetTimeProviderClass", sizeof (GstNetTimeProviderClass), 240},
-  {"GstControllerClass", sizeof (GstControllerClass), 168}
+  {"GstNetTimeProvider", sizeof (GstNetTimeProvider), 152},
-  ,
+  {"GstPushSrcClass", sizeof (GstPushSrcClass), 784},
-  {"GstNetClientClock", sizeof (GstNetClientClock), 368}
+  {"GstPushSrc", sizeof (GstPushSrc), 632},
-  ,
+  {"GstTimedValue", sizeof (GstTimedValue), 32},
-  {"GstNetClientClockClass", sizeof (GstNetClientClockClass), 384}
+  {"GstValueArray", sizeof (GstValueArray), 32},
-  ,
-  {"GstNetTimePacket", sizeof (GstNetTimePacket), 16}
-  ,
-  {"GstNetTimeProvider", sizeof (GstNetTimeProvider), 152}
-  ,
-  {"GstNetTimeProviderClass", sizeof (GstNetTimeProviderClass), 240}
-  ,
   {NULL, 0, 0}
 };