Cosmetics.

[vlc] / modules / access / v4l.c

diff --git a/modules/access/v4l.c b/modules/access/v4l.c
index 32f800e394e668a3f77c0ee115a78de8f187fb59..72e238172e0eb53ace76743726fbb72c533a13f5 100644 (file)
--- a/modules/access/v4l.c
+++ b/modules/access/v4l.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_demux.h>
@@ -141,9 +141,9 @@ static void Close( vlc_object_t * );
 #define FPS_LONGTEXT N_( "Framerate to capture, if applicable " \
     "(-1 for autodetect)." )
 
-static int i_norm_list[] =
+static const int i_norm_list[] =
     { VIDEO_MODE_AUTO, VIDEO_MODE_SECAM, VIDEO_MODE_PAL, VIDEO_MODE_NTSC };
-static const char *psz_norm_list_text[] =
+static const char *const psz_norm_list_text[] =
     { N_("Automatic"), N_("SECAM"), N_("PAL"),  N_("NTSC") };
 
 vlc_module_begin();
@@ -225,7 +225,7 @@ struct quicktime_mjpeg_app1
     uint32_t    i_data_offset;          /* following SOS marker data */
 };
 
-static struct
+static const struct
 {
     int i_v4l;
     int i_fourcc;
@@ -1440,7 +1440,7 @@ static uint8_t *GrabCapture( demux_t *p_demux )
             return NULL;
         }
 
-        if( p_demux->b_die )
+        if( !vlc_object_alive (p_demux) )
         {
             return NULL;
         }