Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 12:22:43 +0000 (13:22 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 12:22:43 +0000 (13:22 +0100)
commita2a430024136fd947637ff56a4fea6a2689ca59d
tree8cab3177242814f02b1e49a51d81b5f2f1660621
parent071c6e8f15f2afff7ca4ce5934c3bae1d76aea95
parent8fb0beaf00aeae2ef6081d08f0d74d6e655a53da
Merge branch 'master' into 0.11

Conflicts:
configure.ac
ext/kate/gstkateenc.c
gst/colorspace/colorspace.c
gst/mpegvideoparse/mpegvideoparse.c
33 files changed:
configure.ac
ext/cog/gstcogmse.c
ext/gme/gstgme.c
ext/gsm/gstgsmdec.c
ext/gsm/gstgsmenc.c
ext/kate/gstkateenc.c
ext/opencv/gsttemplatematch.c
ext/resindvd/resindvdbin.c
ext/resindvd/resindvdsrc.c
ext/resindvd/rsnaudiomunge.c
ext/resindvd/rsndec.c
ext/rsvg/gstrsvgoverlay.c
ext/schroedinger/gstschrodec.c
ext/schroedinger/gstschroenc.c
ext/spc/gstspc.c
ext/vp8/gstvp8enc.c
gst-libs/gst/video/gstbasevideoencoder.c
gst/adpcmdec/adpcmdec.c
gst/adpcmenc/adpcmenc.c
gst/debugutils/gstdebugspy.c
gst/festival/gstfestival.c
gst/inter/gstinteraudiosink.c
gst/inter/gstinteraudiosrc.c
gst/inter/gstintervideosink.c
gst/inter/gstintervideosrc.c
gst/mpegdemux/mpegtsparse.c
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/tsdemux.c
gst/mve/gstmvemux.c
gst/nuvdemux/gstnuvdemux.c
gst/siren/gstsirenenc.c
sys/linsys/gstlinsyssdisink.c
sys/linsys/gstlinsyssdisrc.c