decodebin2: Fix merge error
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 11:03:31 +0000 (12:03 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 11:04:24 +0000 (12:04 +0100)
commit7e5aeba02f27ac495a8624514e7346a4e7ffe598
tree6684ec789c360d38026e111cba0852e9b4dea530
parent1a592199e9b2bf466284604d5119b4fca5826cc0
decodebin2: Fix merge error
gst/playback/gstdecodebin2.c