From: Laurent Aimar <fenrir@videolan.org>
Date: Wed, 9 Jul 2008 18:02:01 +0000 (+0000)
Subject: Fix video format passed to pf_update_regions. (Fix asa without direct
X-Git-Tag: 0.9.0-test2~100
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=77751c92e41bea05a7127eff21ce9040877fa9a5;p=vlc

Fix video format passed to pf_update_regions. (Fix asa without direct
rendering)
---

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 5491fe983d..b1a46ffc04 100644
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -517,7 +517,17 @@ void spu_RenderSubpictures( spu_t *p_spu, video_format_t *p_fmt,
             if ( p_subpic->p_region ) {
                 spu_DestroyRegion( p_spu, p_subpic->p_region );
             }
-            p_subpic->p_region = p_region = p_subpic->pf_update_regions( p_fmt, p_spu, p_subpic, mdate() );
+
+            /* TODO do not reverse the scaling that was done before calling
+             * spu_RenderSubpictures, just pass it along (or do it inside
+             * spu_RenderSubpictures) */
+            video_format_t fmt_org = *p_fmt;
+            fmt_org.i_width =
+            fmt_org.i_visible_width = i_source_video_width;
+            fmt_org.i_height =
+            fmt_org.i_visible_height = i_source_video_height;
+
+            p_subpic->p_region = p_region = p_subpic->pf_update_regions( &fmt_org, p_spu, p_subpic, mdate() );
         }
         else
         {