queue2: fix merge error
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 11 Apr 2012 11:20:18 +0000 (13:20 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 11 Apr 2012 11:20:18 +0000 (13:20 +0200)
commit8ab260d1164b11b589a9b517832bb02913ff4bb8
tree1c6e21603ca82e9ed60f05f5fea21e9e063fa4d7
parent086f8855befb98dc8836f37dc259d459e58309c8
queue2: fix merge error
plugins/elements/gstqueue2.c