Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 16 Feb 2012 13:33:20 +0000 (14:33 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 16 Feb 2012 13:33:20 +0000 (14:33 +0100)
commit2fca270f1956fa3379ebca02203e3f95ae8aba42
tree8ae2bb3e039698f88e6ba73240db9f0b8268d6ba
parentc7216162e4b8bf1b9988c8b0977a57aecbae6b42
parent2ce709cf4a4d46b058218a965885cecfa1568b1f
Merge branch 'master' into 0.11

Conflicts:
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/mpegtspacketizer.c
gst/mpegtsdemux/tsdemux.c
gst/mve/gstmvedemux.c
gst/camerabin2/gstwrappercamerabinsrc.c
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/mpegtspacketizer.c
gst/mpegtsdemux/tsdemux.c
gst/mve/gstmvedemux.c