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

Merge in doc updates for audio enums from 0.10, and get rid
of the #if #else in the enum list, since that confuses gtk-doc.

Conflicts:
	gst-libs/gst/audio/audio.c
	gst-libs/gst/audio/audio.h

diff --cc docs/libs/gst-plugins-base-libs-sections.txt
Simple merge

diff --cc gst-libs/gst/audio/audio.h
index 791a96c,eba7a34..7f87247
--- 1/gst-libs/gst/audio/audio.h
--- 2/gst-libs/gst/audio/audio.h
+++ b/gst-libs/gst/audio/audio.h
@@@ -31,38 -36,54 +37,52 @@@ G_BEGIN_DECL
  /**
   * GstAudioFormat:
   * @GST_AUDIO_FORMAT_UNKNOWN: unknown audio format
-  * @GST_AUDIO_FORMAT_S8: sample
-  * @GST_AUDIO_FORMAT_U8: sample
-  * @GST_AUDIO_FORMAT_S16LE: sample
-  * @GST_AUDIO_FORMAT_S16BE: sample
-  * @GST_AUDIO_FORMAT_U16LE: sample
-  * @GST_AUDIO_FORMAT_U16BE: sample
-  * @GST_AUDIO_FORMAT_S24_32LE: sample
-  * @GST_AUDIO_FORMAT_S24_32BE: sample
-  * @GST_AUDIO_FORMAT_U24_32LE: sample
-  * @GST_AUDIO_FORMAT_U24_32BE: sample
-  * @GST_AUDIO_FORMAT_S32LE: sample
-  * @GST_AUDIO_FORMAT_S32BE: sample
-  * @GST_AUDIO_FORMAT_U32LE: sample
-  * @GST_AUDIO_FORMAT_U32BE: sample
-  * @GST_AUDIO_FORMAT_S24LE: sample
-  * @GST_AUDIO_FORMAT_S24BE: sample
-  * @GST_AUDIO_FORMAT_U24LE: sample
-  * @GST_AUDIO_FORMAT_U24BE: sample
-  * @GST_AUDIO_FORMAT_S20LE: sample
-  * @GST_AUDIO_FORMAT_S20BE: sample
-  * @GST_AUDIO_FORMAT_U20LE: sample
-  * @GST_AUDIO_FORMAT_U20BE: sample
-  * @GST_AUDIO_FORMAT_S18LE: sample
-  * @GST_AUDIO_FORMAT_S18BE: sample
-  * @GST_AUDIO_FORMAT_U18LE: sample
-  * @GST_AUDIO_FORMAT_U18BE: sample
-  * @GST_AUDIO_FORMAT_F32LE: sample
-  * @GST_AUDIO_FORMAT_F32BE: sample
-  * @GST_AUDIO_FORMAT_F64LE: sample
-  * @GST_AUDIO_FORMAT_F64BE: sample
+  * @GST_AUDIO_FORMAT_S8: 8 bits in 8 bits, signed
+  * @GST_AUDIO_FORMAT_U8: 8 bits in 8 bits, unsigned
+  * @GST_AUDIO_FORMAT_S16LE: 16 bits in 16 bits, signed, little endian
+  * @GST_AUDIO_FORMAT_S16BE: 16 bits in 16 bits, signed, big endian
+  * @GST_AUDIO_FORMAT_U16LE: 16 bits in 16 bits, unsigned, little endian
+  * @GST_AUDIO_FORMAT_U16BE: 16 bits in 16 bits, unsigned, big endian
+  * @GST_AUDIO_FORMAT_S24_32LE: 24 bits in 32 bits, signed, little endian
+  * @GST_AUDIO_FORMAT_S24_32BE: 24 bits in 32 bits, signed, big endian
+  * @GST_AUDIO_FORMAT_U24_32LE: 24 bits in 32 bits, unsigned, little endian
+  * @GST_AUDIO_FORMAT_U24_32BE: 24 bits in 32 bits, unsigned, big endian
+  * @GST_AUDIO_FORMAT_S32LE: 32 bits in 32 bits, signed, little endian
+  * @GST_AUDIO_FORMAT_S32BE: 32 bits in 32 bits, signed, big endian
+  * @GST_AUDIO_FORMAT_U32LE: 32 bits in 32 bits, unsigned, little endian
+  * @GST_AUDIO_FORMAT_U32BE: 32 bits in 32 bits, unsigned, big endian
+  * @GST_AUDIO_FORMAT_S24LE: 24 bits in 24 bits, signed, little endian
+  * @GST_AUDIO_FORMAT_S24BE: 24 bits in 24 bits, signed, big endian
+  * @GST_AUDIO_FORMAT_U24LE: 24 bits in 24 bits, unsigned, little endian
+  * @GST_AUDIO_FORMAT_U24BE: 24 bits in 24 bits, unsigned, big endian
+  * @GST_AUDIO_FORMAT_S20LE: 20 bits in 24 bits, signed, little endian
+  * @GST_AUDIO_FORMAT_S20BE: 20 bits in 24 bits, signed, big endian
+  * @GST_AUDIO_FORMAT_U20LE: 20 bits in 24 bits, unsigned, little endian
+  * @GST_AUDIO_FORMAT_U20BE: 20 bits in 24 bits, unsigned, big endian
+  * @GST_AUDIO_FORMAT_S18LE: 18 bits in 24 bits, signed, little endian
+  * @GST_AUDIO_FORMAT_S18BE: 18 bits in 24 bits, signed, big endian
+  * @GST_AUDIO_FORMAT_U18LE: 18 bits in 24 bits, unsigned, little endian
+  * @GST_AUDIO_FORMAT_U18BE: 18 bits in 24 bits, unsigned, big endian
+  * @GST_AUDIO_FORMAT_F32LE: 32-bit floating point samples, little endian
+  * @GST_AUDIO_FORMAT_F32BE: 32-bit floating point samples, big endian
+  * @GST_AUDIO_FORMAT_F64LE: 64-bit floating point samples, little endian
+  * @GST_AUDIO_FORMAT_F64BE: 64-bit floating point samples, big endian
+  * @GST_AUDIO_FORMAT_S16: 16 bits in 16 bits, signed, native endianness
+  * @GST_AUDIO_FORMAT_U16: 16 bits in 16 bits, unsigned, native endianness
+  * @GST_AUDIO_FORMAT_S24_32: 24 bits in 32 bits, signed, native endianness
+  * @GST_AUDIO_FORMAT_U24_32: 24 bits in 32 bits, unsigned, native endianness
+  * @GST_AUDIO_FORMAT_S32: 32 bits in 32 bits, signed, native endianness
+  * @GST_AUDIO_FORMAT_U32: 32 bits in 32 bits, unsigned, native endianness
+  * @GST_AUDIO_FORMAT_S24: 24 bits in 24 bits, signed, native endianness
+  * @GST_AUDIO_FORMAT_U24: 24 bits in 24 bits, unsigned, native endianness
+  * @GST_AUDIO_FORMAT_S20: 20 bits in 24 bits, signed, native endianness
+  * @GST_AUDIO_FORMAT_U20: 20 bits in 24 bits, unsigned, native endianness
+  * @GST_AUDIO_FORMAT_S18: 18 bits in 24 bits, signed, native endianness
+  * @GST_AUDIO_FORMAT_U18: 18 bits in 24 bits, unsigned, native endianness
+  * @GST_AUDIO_FORMAT_F32: 32-bit floating point samples, native endianness
+  * @GST_AUDIO_FORMAT_F64: 64-bit floating point samples, native endianness
   *
   * Enum value describing the most common audio formats.
 - *
 - * Since: 0.10.36
   */
  typedef enum {
    GST_AUDIO_FORMAT_UNKNOWN,