Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 22 Mar 2012 10:35:13 +0000 (11:35 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 22 Mar 2012 10:35:13 +0000 (11:35 +0100)
commit32bd12dba91a11dc91beea828246389622964348
treec411d73b6c5ed46cc9835f79865029cc3ba5cdfc
parent797f19a0361dfda979e3535f8dc904d11df902aa
parentfe0e2d65e190b816959c624149a6dc48b7118796
Merge branch 'master' into 0.11

Conflicts:
.gitignore
common
configure.ac
ext/vorbis/gstvorbisdeclib.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/riff/riff-read.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkconvertbin.c
tests/check/libs/video.c
14 files changed:
.gitignore
configure.ac
ext/vorbis/gstvorbisdeclib.h
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudiodecoder.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/audio/gstaudioencoder.h
gst-libs/gst/riff/riff-read.c
gst-libs/gst/video/video-overlay-composition.c
gst/playback/gstplaybin2.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkconvertbin.c
gst/playback/gsturidecodebin.c
tests/check/libs/video.c