* include/video_output.h, ALL: changed api for vout_Request()/vout_Create() to be...

[vlc] / modules / video_filter / deinterlace.c

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index b959f6c57ee9dfd998d9ec0bcd31c1330c0d2ad1..3a4a4409c31682cfdce935d044464bc144597463 100644 (file)
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -320,9 +320,18 @@ static int Init( vout_thread_t *p_vout )
 static vout_thread_t *SpawnRealVout( vout_thread_t *p_vout )
 {
     vout_thread_t *p_real_vout = NULL;
+    video_format_t fmt = {0};
 
     msg_Dbg( p_vout, "spawning the real video output" );
 
+    fmt.i_width = fmt.i_visible_width = p_vout->output.i_width;
+    fmt.i_height = fmt.i_visible_height = p_vout->output.i_height;
+    fmt.i_x_offset = fmt.i_y_offset = 0;
+    fmt.i_chroma = p_vout->output.i_chroma;
+    fmt.i_aspect = p_vout->output.i_aspect;
+    fmt.i_sar_num = p_vout->output.i_aspect * fmt.i_height / fmt.i_width;
+    fmt.i_sar_den = VOUT_ASPECT_FACTOR;
+
     switch( p_vout->render.i_chroma )
     {
     case VLC_FOURCC('I','4','2','0'):
@@ -332,28 +341,21 @@ static vout_thread_t *SpawnRealVout( vout_thread_t *p_vout )
         {
         case DEINTERLACE_MEAN:
         case DEINTERLACE_DISCARD:
-            p_real_vout =
-                vout_Create( p_vout,
-                       p_vout->output.i_width, p_vout->output.i_height / 2,
-                       p_vout->output.i_chroma, p_vout->output.i_aspect );
+            fmt.i_height = fmt.i_visible_height = p_vout->output.i_height / 2;
+            p_real_vout = vout_Create( p_vout, &fmt );
             break;
 
         case DEINTERLACE_BOB:
         case DEINTERLACE_BLEND:
         case DEINTERLACE_LINEAR:
-            p_real_vout =
-                vout_Create( p_vout,
-                       p_vout->output.i_width, p_vout->output.i_height,
-                       p_vout->output.i_chroma, p_vout->output.i_aspect );
+            p_real_vout = vout_Create( p_vout, &fmt );
             break;
         }
         break;
 
     case VLC_FOURCC('I','4','2','2'):
-        p_real_vout =
-            vout_Create( p_vout,
-                       p_vout->output.i_width, p_vout->output.i_height,
-                       VLC_FOURCC('I','4','2','0'), p_vout->output.i_aspect );
+        fmt.i_chroma = VLC_FOURCC('I','4','2','0');
+        p_real_vout = vout_Create( p_vout, &fmt );
         break;
 
     default: