convertframe: fix for merge conflict
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 07:55:47 +0000 (09:55 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 07:55:47 +0000 (09:55 +0200)
commitdfcb6580a3b0ab4639feeab3e85326e7907d3805
treedeee8baf36ddef3469446e7ee9362bfc8dccc6d3
parenta87c02123746982e10032ed02dc7b8b4df35b3f7
convertframe: fix for merge conflict
gst-libs/gst/video/convertframe.c