* modules/video_output/directx/directx.c,glwin32.c: revert backport of 13050 for...

[vlc] / src / video_output / vout_pictures.h

diff --git a/src/video_output/vout_pictures.h b/src/video_output/vout_pictures.h
index 46e0066e7fef670a61d31163a7053c7a6eba17f4..a636aad4d8b8031403f19fc06e9d44d6911709aa 100644 (file)
--- a/src/video_output/vout_pictures.h
+++ b/src/video_output/vout_pictures.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * vout_pictures.h : picture management definitions
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: vout_pictures.h,v 1.3 2002/11/28 17:35:01 sam Exp $
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -47,6 +47,7 @@
 /* Planar YUV 4:2:0, Y:U:V */
 #define FOURCC_I420         VLC_FOURCC('I','4','2','0')
 #define FOURCC_IYUV         VLC_FOURCC('I','Y','U','V')
+#define FOURCC_J420         VLC_FOURCC('J','4','2','0')
 
 /* Planar YUV 4:2:0, Y:V:U */
 #define FOURCC_YV12         VLC_FOURCC('Y','V','1','2')
@@ -72,15 +73,26 @@
 /* Packed YUV 2:1:1, Y:U:Y:V */
 #define FOURCC_Y211         VLC_FOURCC('Y','2','1','1')
 
+/* Planar YUV 4:1:1, Y:U:V */
+#define FOURCC_I411         VLC_FOURCC('I','4','1','1')
+
 /* Planar YUV 4:1:0, Y:U:V */
 #define FOURCC_I410         VLC_FOURCC('I','4','1','0')
+#define FOURCC_YVU9         VLC_FOURCC('Y','V','U','9')
 
 /* Planar Y, packed UV, from Matrox */
 #define FOURCC_YMGA         VLC_FOURCC('Y','M','G','A')
 
 /* Planar 4:2:2, Y:U:V */
 #define FOURCC_I422         VLC_FOURCC('I','4','2','2')
+#define FOURCC_J422         VLC_FOURCC('J','4','2','2')
 
 /* Planar 4:4:4, Y:U:V */
 #define FOURCC_I444         VLC_FOURCC('I','4','4','4')
+#define FOURCC_J444         VLC_FOURCC('J','4','4','4')
+
+/* Planar 4:4:4:4 Y:U:V:A */
+#define FOURCC_YUVA         VLC_FOURCC('Y','U','V','A')
 
+/* Palettized YUV with palette element Y:U:V:A */
+#define FOURCC_YUVP         VLC_FOURCC('Y','U','V','P')