* Fix YUV422, YUY2, YUYV mappings in V4L.

* Don't immediatly overwrite our driver retrieved video palette value with 0.

* Fix YUV422, YUY2, YUYV mappings in V4L.
* Don't immediatly overwrite our driver retrieved video palette value with 0.
3ea46905 · Derk-Jan Hartman · 4d1f3123 · 3ea46905
Commit 3ea46905 authored Nov 30, 2006 by Derk-Jan Hartman
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

modules/access/v4l.c modules/access/v4l.c +4 -2

No files found.
--- a/modules/access/v4l.c
+++ b/modules/access/v4l.c
@@ -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 */