Merge remote-tracking branch 'origin/0.10'
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Fri, 6 Apr 2012 12:52:12 +0000 (14:52 +0200)
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Fri, 6 Apr 2012 12:52:12 +0000 (14:52 +0200)
commit07db2da91cb4e4f0d44e9e3c44b5dc924593c387
tree10156e1794f40d592f93da408d402df805ef33a6
parent513aa08beeb57bcd2ae3d675eb0cd649036de552
parent7cfdc7e912833ea8025857ebf37c2433f94ff4ce
Merge remote-tracking branch 'origin/0.10'

Conflicts:
gst/h264parse/gsth264parse.c
gst/videoparsers/gsth264parse.c
gst/videoparsers/gsth264parse.c