* all : set pf_demux_control.

[vlc] / modules / access / v4l / v4l.c

diff --git a/modules/access/v4l/v4l.c b/modules/access/v4l/v4l.c
index 0a430f3c35fe9c36906f830b6d184b04bf271c89..39365343a2b83c23fe7967bd982eb987c082f60e 100644 (file)
--- a/modules/access/v4l/v4l.c
+++ b/modules/access/v4l/v4l.c
@@ -2,7 +2,7 @@
  * v4l.c : Video4Linux input module for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: v4l.c,v 1.22 2003/08/29 18:58:49 fenrir Exp $
+ * $Id: v4l.c,v 1.24 2003/09/07 22:49:05 fenrir Exp $
  *
  * Author: Laurent Aimar <fenrir@via.ecp.fr>
  *         Paul Forgey <paulf at aphrodite dot com>
@@ -743,7 +743,7 @@ static int AccessOpen( vlc_object_t *p_this )
         /* Find out video format used by device */
         if( ioctl( p_sys->fd, VIDIOCGPICT, &p_sys->vid_picture ) == 0 )
         {
-            int i_chroma;
+            int i_chroma = VLC_FOURCC( ' ', ' ', ' ', ' ' );
             struct video_picture vid_picture = p_sys->vid_picture;
 
             /* Try to set the format to something easy to encode */
@@ -1399,6 +1399,7 @@ static int DemuxOpen( vlc_object_t *p_this )
     }
 
     p_input->pf_demux = Demux;
+    p_input->pf_demux_control = demux_vaControlDefault;
     return VLC_SUCCESS;
 }