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)
commit3625d8367a054d52e28fc706f29cf40a5ca5cbd7
treea7fc098dc7bb4b250c34bc03380daa442c7d56aa
parenteface67e001353f6b6ae94bdd71d396dbeb99dc7
Merge branch 'master' into 0.11

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