subtitleoverlay: fix merge error
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 9 Feb 2012 14:51:10 +0000 (15:51 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 9 Feb 2012 14:51:10 +0000 (15:51 +0100)
commit0dd59060d9dc09f551ccf808bfc719457e82ee0d
tree53f63af771ec91490901b19568ad47057a557de3
parentf31d5d75056f839f5529bcc975b9afbcd7b16de6
subtitleoverlay: fix merge error

Fix merge error from commit fb6d09055ae90979682fa4b1c6ee4f4abdaafd8f
gst/playback/gstsubtitleoverlay.c