Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 20 Feb 2012 15:07:50 +0000 (16:07 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 20 Feb 2012 15:07:50 +0000 (16:07 +0100)
commita9f5def9d11c9a6623d7ed9d365160a4d8076b17
treea9dfdf436a01ce2f5dc0cd5551afd9445dfa9bf7
parent232ef9cc391efb52ea07ae7a84d1acca6e7124a6
parent87163ea09117bb836b3486d79f9cfb657250b805
Merge branch 'master' into 0.11

Conflicts:
ext/opus/gstopusparse.c
gst/colorspace/colorspace.c
ext/gme/gstgme.c
ext/opus/gstopusparse.c
ext/schroedinger/gstschrodec.c
ext/schroedinger/gstschroenc.c
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/mpegtspacketizer.c
sys/decklink/gstdecklinksink.cpp