Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sat, 8 Oct 2011 08:19:06 +0000 (10:19 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sat, 8 Oct 2011 08:19:06 +0000 (10:19 +0200)
commit73b894107a1d062b2d06dbdf77bca2fafb1feef7
treef36f96fdd2254ee37bbbc21fa9a876f04abb7c96
parent1d3980cda23a8a4daf8c25ad893c92209a41e881
parentf63f09483f22fd7e2672d3df58be8d8a69b4603c
Merge branch 'master' into 0.11

Conflicts:
ext/vorbis/gstvorbisdec.c
ext/vorbis/gstvorbisenc.c
ext/vorbis/gstvorbisenc.h
gst/audiotestsrc/gstaudiotestsrc.c
12 files changed:
ext/vorbis/gstvorbisdec.c
ext/vorbis/gstvorbisdec.h
ext/vorbis/gstvorbisenc.c
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudioencoder.c
gst/audiotestsrc/gstaudiotestsrc.c
gst/encoding/gstencodebin.c
gst/playback/gstplaybin2.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkaudioconvert.c
gst/playback/gstplaysinkvideoconvert.c
tests/check/elements/audiotestsrc.c