Unexport libvlc_media_player_new_from_input_thread

[vlc] / src / video_output / vout_pictures.h

diff --git a/src/video_output/vout_pictures.h b/src/video_output/vout_pictures.h
index 42edd1d07c9bcb55bb678505c59f8de1f2a56760..8cfc8922827bfb2264d259ad61e23af0ecd21406 100644 (file)
--- a/src/video_output/vout_pictures.h
+++ b/src/video_output/vout_pictures.h
@@ -90,6 +90,10 @@
 #define FOURCC_I422         VLC_FOURCC('I','4','2','2')
 #define FOURCC_J422         VLC_FOURCC('J','4','2','2')
 
+/* Planar 4:4:0, Y:U:V */
+#define FOURCC_I440         VLC_FOURCC('I','4','4','0')
+#define FOURCC_J440         VLC_FOURCC('J','4','4','0')
+
 /* 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')
@@ -100,8 +104,14 @@
 /* Palettized YUV with palette element Y:U:V:A */
 #define FOURCC_YUVP         VLC_FOURCC('Y','U','V','P')
 
+/* Palettized RGB with palette element R:G:B */
+#define FOURCC_RGBP         VLC_FOURCC('R','G','B','P')
+
+
 /* Planar 8-bit grayscale */
 #define FOURCC_GREY         VLC_FOURCC('G','R','E','Y')
+#define FOURCC_Y800         VLC_FOURCC('Y','8','0','0')
+#define FOURCC_Y8           VLC_FOURCC('Y','8',' ',' ')
 
 /* Alignment of critical dynamic data structure
  *
@@ -123,7 +133,7 @@ void *vlc_memalign (void **pp, size_t align, size_t size)
         return NULL;
 
     align--;
-    ptr = malloc (size + --align);
+    ptr = malloc (size + align);
     if (ptr == NULL)
         return NULL;