Merge pull request #4885 from sportica/collect_subtitles
authorjmarshallnz <jcmarsha@gmail.com>
Sun, 29 Jun 2014 21:50:33 +0000 (09:50 +1200)
committerTrent Nelson <trent.nelson@pivosgroup.com>
Fri, 11 Jul 2014 02:49:09 +0000 (10:49 +0800)
commit19bb2fa8cfa8028c2da948df0db1ae16bcb97261
tree7063d478522e9d78910290bb21752f6580f590e4
parent1459cb92701d4db3cde0efc39130968cd5586dee
Merge pull request #4885 from sportica/collect_subtitles

Collect subtitles at the same time to prevent overlap
xbmc/cores/VideoRenderers/OverlayRenderer.cpp
xbmc/cores/VideoRenderers/OverlayRenderer.h
xbmc/cores/VideoRenderers/OverlayRendererGUI.cpp
xbmc/cores/VideoRenderers/OverlayRendererGUI.h