Changeset 88e31f14f1b5bc41d1f2be07e4623b52623b746a

Timestamp:

07/20/07 14:46:02 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1184935562 +0000

git-parent:

[4a1b6b00bae98767ddf5ae84c571859cb51be630]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1184935562 +0000

Message:

Don't scale when original widht/height is zero.

Files:

• src/video_output/vout_subpictures.c (modified) (5 diffs)

src/video_output/vout_subpictures.c

@@ -568 +568 @@
-        if( p_spu->p_text )
-        {
-p_subpic->i_original_picture_height > 0
-p_subpic->i_original_picture_width  > 0
+(p_subpic->i_original_picture_height > 0)
+(p_subpic->i_original_picture_width  > 0)
-            {
-                p_spu->p_text->fmt_out.video.i_width =
@@ -592 +592 @@
-        i_scale_height = i_scale_height_orig;
-
-p_subpic->i_original_picture_height > 0
-p_subpic->i_original_picture_width  > 0
+(p_subpic->i_original_picture_height > 0)
+(p_subpic->i_original_picture_width  > 0)
-        {
-            i_scale_width = i_scale_width * p_fmt->i_width /
@@ -632 +632 @@
-
-        /* Load the scaling module */
-
-
+
+
+
-        {
-            p_spu->p_scale = vlc_object_create( p_spu, VLC_OBJECT_FILTER );
@@ -735 +736 @@
-            }
-
-
+
+
-                p_spu->p_scale && !p_region->p_cache )
-            {
@@ -777 +779 @@
-                }
-            }
-
+
+
-                p_spu->p_scale && p_region->p_cache )
-            {