Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 14:50:37 +0000 (15:50 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 10 Jan 2012 14:50:37 +0000 (15:50 +0100)
commita01a4ea2d3e98c7ffcedf67d48a167e5dfdd1c07
tree62de4d4a57689565d72c5c707f74db1a7d5a9108
parentc849631686baf0012ca89d9f64cc8665277cbcba
parent1f543ec0ada7849a25a6451679eeb3cd3f605c1f
Merge branch 'master' into 0.11

Conflicts:
gst/mpegtsdemux/tsdemux.c
gst/videoparsers/gsth264parse.c
tests/check/elements/camerabin2.c
ext/opus/gstopusenc.c
ext/vp8/gstvp8dec.c
gst-libs/gst/video/gstbasevideocodec.h
gst-libs/gst/video/gstbasevideodecoder.c
gst/coloreffects/gstcoloreffects.c
gst/interlace/gstinterlace.c
gst/mpegtsdemux/tsdemux.c
gst/videoparsers/gsth264parse.c
gst/videoparsers/gstmpegvideoparse.c
tests/check/elements/camerabin2.c
tests/examples/camerabin2/gst-camera2.c