summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2009-06-02 14:17:05 +0000
committerphintuka <phintuka>2009-06-02 14:17:05 +0000
commit555ea5e04290dae5f318c96b877efa5dafd7d596 (patch)
tree6c4cb371d8d1ec927709bb3784b519d13eef64bd
parent0c5c0c79c16a2c6b3e9ebb94860ff259e94839d8 (diff)
downloadxineliboutput-555ea5e04290dae5f318c96b877efa5dafd7d596.tar.gz
xineliboutput-555ea5e04290dae5f318c96b877efa5dafd7d596.tar.bz2
Do not set overlay extent if overlay has been scaled already
-rw-r--r--xine/osd_manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xine/osd_manager.c b/xine/osd_manager.c
index e35f58bf..a7d0d6b4 100644
--- a/xine/osd_manager.c
+++ b/xine/osd_manager.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: osd_manager.c,v 1.12 2009-06-02 14:15:40 phintuka Exp $
+ * $Id: osd_manager.c,v 1.13 2009-06-02 14:17:05 phintuka Exp $
*
*/
@@ -447,7 +447,7 @@ static int exec_osd_set_rle(osd_manager_impl_t *this, osd_command_t *cmd)
memcpy(ov_overlay.hili_color, &extra_data, sizeof(extra_data));
#ifdef VO_CAP_CUSTOM_EXTENT_OVERLAY
- if (cmd->scaling) {
+ if (cmd->scaling && !rle_scaled) {
ov_overlay.extent_width = osd->extent_width;
ov_overlay.extent_height = osd->extent_height;
}