* src/video_output/vout_pictures.c: support the GREY fourcc.

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index dd53f3e7ed329eba73f71e089cf4b43fdef48053..c37f3a6b6c3c69a2d94d5e992d7ecd06e7d24661 100644 (file)
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -572,7 +572,6 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma,
         case FOURCC_YUY2:
         case FOURCC_UYVY:
         case FOURCC_J422:
-            p_format->i_bits_per_pixel = 16;
             p_format->i_bits_per_pixel = 16;
             break;
         case FOURCC_I411:
@@ -607,6 +606,11 @@ void vout_InitFormat( video_frame_format_t *p_format, vlc_fourcc_t i_chroma,
         case FOURCC_RGB2:
             p_format->i_bits_per_pixel = 8;
             break;
+
+        case FOURCC_GREY:
+            p_format->i_bits_per_pixel = 8;
+            break;
+
         default:
             p_format->i_bits_per_pixel = 0;
             break;
@@ -832,6 +836,15 @@ int __vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
             p_pic->i_planes = 1;
             break;
 
+        case FOURCC_GREY:
+            p_pic->p->i_lines = i_height_aligned;
+            p_pic->p->i_visible_lines = i_height;
+            p_pic->p->i_pitch = i_width_aligned;
+            p_pic->p->i_visible_pitch = i_width;
+            p_pic->p->i_pixel_pitch = 1;
+            p_pic->i_planes = 1;
+            break;
+
         default:
             msg_Err( p_this, "unknown chroma type 0x%.8x (%4.4s)",
                              i_chroma, (char*)&i_chroma );

diff --git a/src/video_output/vout_pictures.h b/src/video_output/vout_pictures.h
index 4b7c78d9fbc36b59a3013c7a20bbd1b5656dac49..511fa5665d619c4e047ccc917fb9395623922e48 100644 (file)
--- a/src/video_output/vout_pictures.h
+++ b/src/video_output/vout_pictures.h
@@ -99,3 +99,6 @@
 
 /* Palettized YUV with palette element Y:U:V:A */
 #define FOURCC_YUVP         VLC_FOURCC('Y','U','V','P')
+
+/* Planar 8-bit grayscale */
+#define FOURCC_GREY         VLC_FOURCC('G','R','E','Y')