subtitle: fix merge
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 25 Jan 2012 11:27:49 +0000 (12:27 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 25 Jan 2012 11:33:03 +0000 (12:33 +0100)
commit15b7375c44ec1f4f03d3f9b394da483aacac0015
tree398da7aae1f4921fcbb2c0e1606d2a83cea97c93
parente7575bc525861f5aca5d29ddd7c33b7e72e3f161
subtitle: fix merge
gst/playback/gstsubtitleoverlay.c