Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 26 Nov 2011 12:12:59 +0000 (12:12 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 26 Nov 2011 12:12:59 +0000 (12:12 +0000)
commit32b14c6ed3501518aafa2cfe7aad3ccef7184bad
tree000165cdd9c55df0da8ec7f1e977ea0b883ccf27
parentd94535832ba58a6c7250e6b5fbb03cddc442fd7b
parentc6b9145630373f82cb82040bf54c0189bab416db
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
ext/vorbis/gstvorbisenc.c
gst/playback/gstdecodebin2.c
gst/playback/gstplaysinkconvertbin.c
gst/videorate/gstvideorate.c
ext/ogg/gstoggdemux.c
ext/ogg/gstoggdemux.h
ext/ogg/gstoggmux.c
ext/vorbis/gstvorbisenc.c
gst-libs/gst/audio/Makefile.am
gst-libs/gst/audio/gstaudiodecoder.h
gst-libs/gst/audio/gstaudioencoder.h
gst/playback/gstdecodebin2.c
gst/playback/gstplaybin2.c
gst/playback/gstplaysinkconvertbin.c
gst/videorate/gstvideorate.c