Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 11:49:11 +0000 (12:49 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 11:49:11 +0000 (12:49 +0100)
commit10554b271fc380722f76d6c6736eb59d56adda37
tree781e9a6c531955ddf7eb03ca2f988636fff100ce
parent77d6229a54eb6da76b8396e6f3fdb2d6283253bc
parenta476d529d2f2d6a2c4a7008387de7cd427581b5f
Merge branch 'master' into 0.11

Conflicts:
ext/flac/gstflacdec.c
ext/jpeg/gstjpegenc.c
ext/pulse/pulsesink.c
sys/v4l2/gstv4l2src.c
23 files changed:
configure.ac
ext/pulse/pulsesink.c
ext/pulse/pulsesrc.c
gst/alpha/gstalphacolor.c
gst/avi/gstavidemux.c
gst/cutter/gstcutter.c
gst/deinterlace/gstdeinterlace.c
gst/imagefreeze/gstimagefreeze.c
gst/isomp4/atomsrecovery.c
gst/matroska/matroska-demux.c
gst/rtp/gstrtph263ppay.c
gst/rtp/gstrtpmp4adepay.c
gst/rtp/gstrtptheoradepay.c
gst/rtpmanager/gstrtpbin.c
gst/rtpmanager/gstrtpptdemux.c
gst/rtpmanager/rtpsession.c
gst/rtsp/gstrtspsrc.c
sys/oss4/oss4-sink.c
sys/oss4/oss4-source.c
sys/v4l2/gstv4l2src.c
sys/waveform/gstwaveformsink.c
tests/check/elements/autodetect.c
tests/check/elements/videocrop.c