Changeset 1371457214b9473357de5e8e066d552f168e3e8b

Timestamp:

13/03/08 08:57:39 (9 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1205395059 +0100

git-parent:

[984723a78f8006b9fea6ba981036d91e2934bab1]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1205395059 +0100

Message:

Properly fix use of SWSCALE_* defines in zvbi.

Files:

• modules/codec/zvbi.c (modified) (6 diffs)

modules/codec/zvbi.c

@@ -137 +137 @@
-
-    /* Misc */
-SWSCALE_H
+TREE
-    image_handler_t         *p_image;
-#endif
@@ -182 +182 @@
-    memset( p_sys, 0, sizeof(decoder_sys_t) );
-
-SWSCALE_H
+TREE
-    p_sys->p_image = image_HandlerCreate( VLC_OBJECT(p_dec) );
-    if( !p_sys->p_image )
@@ -226 +226 @@
-        p_dec->fmt_out.video.i_chroma = VLC_FOURCC('T','E','X','T');
-    else
-SWSCALE_H
+TREE
-        p_dec->fmt_out.video.i_chroma = VLC_FOURCC('Y','U','V','A');
-#else
@@ -247 +247 @@
-    var_DelCallback( p_dec, "vbi-opaque", Opaque, p_sys );
-
-SWSCALE_H
+TREE
-    if( p_sys->p_image ) image_HandlerDelete( p_sys->p_image );
-#endif
@@ -324 +324 @@
-    memset( &fmt, 0, sizeof(video_format_t) );
-    fmt.i_chroma = p_sys->b_text ? VLC_FOURCC('T','E','X','T') :
-SWSCALE_H
+TREE
-                                   VLC_FOURCC('Y','U','V','A');
-#else
@@ -384 +384 @@
-    else
-    {
-SWSCALE_H
+TREE
-        video_format_t fmt_in;
-        picture_t *p_pic, *p_dest;