X-Git-Url: https://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=modules%2Faccess%2Fv4l.c;h=6c4d63314b5793f81dec3cf9822f7ced271f9871;hp=6938f6a595b4606d40a11a89e797f3df19ce8b62;hb=6a46d6cc7e08e0a913e3d17db274f57791df8301;hpb=05f57ec95e1535df282146c9d0964913d1a2f6d9;ds=sidebyside diff --git a/modules/access/v4l.c b/modules/access/v4l.c index 6938f6a595..6c4d63314b 100644 --- a/modules/access/v4l.c +++ b/modules/access/v4l.c @@ -142,7 +142,7 @@ static void Close( vlc_object_t * ); static int i_norm_list[] = { VIDEO_MODE_AUTO, VIDEO_MODE_SECAM, VIDEO_MODE_PAL, VIDEO_MODE_NTSC }; -static char *psz_norm_list_text[] = +static const char *psz_norm_list_text[] = { N_("Automatic"), N_("SECAM"), N_("PAL"), N_("NTSC") }; vlc_module_begin(); @@ -237,7 +237,9 @@ static struct { VIDEO_PALETTE_RGB555, VLC_FOURCC( 'R', 'V', '1', '5' ) }, { VIDEO_PALETTE_RGB24, VLC_FOURCC( 'R', 'V', '2', '4' ) }, { VIDEO_PALETTE_RGB32, VLC_FOURCC( 'R', 'V', '3', '2' ) }, - { VIDEO_PALETTE_YUV422, VLC_FOURCC( 'I', '4', '2', '2' ) }, + { VIDEO_PALETTE_YUV422, VLC_FOURCC( 'Y', 'U', 'Y', '2' ) }, + { VIDEO_PALETTE_YUV422, VLC_FOURCC( 'Y', 'U', 'Y', 'V' ) }, + { VIDEO_PALETTE_YUYV, VLC_FOURCC( 'Y', 'U', 'Y', '2' ) }, { VIDEO_PALETTE_YUYV, VLC_FOURCC( 'Y', 'U', 'Y', 'V' ) }, { VIDEO_PALETTE_UYVY, VLC_FOURCC( 'U', 'Y', 'V', 'Y' ) }, { VIDEO_PALETTE_YUV420, VLC_FOURCC( 'I', '4', '2', 'N' ) }, @@ -1173,12 +1175,12 @@ static int OpenVideoDev( demux_t *p_demux, char *psz_device ) char *psz; int i; - vid_picture.palette = 0; p_sys->i_fourcc = 0; psz = var_CreateGetString( p_demux, "v4l-chroma" ); if( strlen( psz ) >= 4 ) { + vid_picture.palette = 0; int i_chroma = VLC_FOURCC( psz[0], psz[1], psz[2], psz[3] ); /* Find out v4l chroma code */