Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 29 Aug 2011 09:37:36 +0000 (11:37 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 29 Aug 2011 09:37:36 +0000 (11:37 +0200)
commite1287b97abb8f9edfcf43db72d9dc440cafa16e3
tree9b66c948ae22499e0d627b2c025f43ba5756a3be
parent82d82203f68eb1afbf65ac7d91721c8f65ebc005
parent67a12c9c7298717901efce0bcfa6abbe84f97cb0
Merge branch 'master' into 0.11

Conflicts:
ext/ogg/gstoggmux.c
gst-libs/gst/audio/audio.c
gst-libs/gst/audio/audio.h
gst-libs/gst/audio/multichannel.h
gst-libs/gst/pbutils/Makefile.am
gst-libs/gst/pbutils/gstdiscoverer.c
gst/playback/gstplaysinkaudioconvert.c
gst/playback/gstplaysinkvideoconvert.c
win32/common/libgstaudio.def
21 files changed:
docs/libs/gst-plugins-base-libs-sections.txt
ext/ogg/gstoggdemux.c
ext/ogg/gstoggmux.c
ext/ogg/gstoggparse.c
ext/theora/gsttheoraenc.c
gst-libs/gst/audio/Makefile.am
gst-libs/gst/audio/audio.c
gst-libs/gst/audio/gstbaseaudiodecoder.c
gst-libs/gst/audio/multichannel.c
gst-libs/gst/audio/multichannel.h
gst-libs/gst/pbutils/Makefile.am
gst-libs/gst/pbutils/gstdiscoverer-types.c
gst-libs/gst/pbutils/gstdiscoverer.c
gst-libs/gst/pbutils/gstdiscoverer.h
gst-libs/gst/pbutils/pbutils-private.h
gst-libs/gst/rtp/gstbasertppayload.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkaudioconvert.c
gst/playback/gstplaysinkvideoconvert.c
tools/gst-discoverer.c
win32/common/libgstaudio.def