[vlc-devel] commit: mac text renderer: make sure our picture is of the right height. ( Derk-Jan Hartman )

[git version control]

vlc | branch: 1.0-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Sun Jun 21 23:00:59 2009 +0200| [cc5b6aeeeef7bff7f4f9c1aae696091eed212530] | committer: Derk-Jan Hartman 

mac text renderer: make sure our picture is of the right height.

This will likely fix #2649
(cherry picked from commit 575095118f9f3016416e1f494ad14dcb20fd60a3)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cc5b6aeeeef7bff7f4f9c1aae696091eed212530
---

 modules/misc/quartztext.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c
index 27af980..b30b5a5 100644
--- a/modules/misc/quartztext.c
+++ b/modules/misc/quartztext.c
@@ -850,7 +850,7 @@ static int RenderYUVA( filter_t *p_filter, subpicture_region_t *p_region, UniCha
     fmt.i_chroma = VLC_FOURCC('Y','U','V','A');
     fmt.i_aspect = 0;
     fmt.i_width = fmt.i_visible_width = i_width;
-    fmt.i_height = fmt.i_visible_height = i_textblock_height + VERTICAL_MARGIN * 2;
+    fmt.i_height = fmt.i_visible_height = __MIN( i_height, i_textblock_height + VERTICAL_MARGIN * 2);
     fmt.i_x_offset = fmt.i_y_offset = 0;
 
     p_region->p_picture = picture_New( fmt.i_chroma, fmt.i_width, fmt.i_height, fmt.i_aspect );