Wayland/shell: fix NULL dereference in pathological case

[vlc] / include / vlc_fourcc.h

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 825a0494796fed0115b2c6b425ee5ff5cd55a85c..d63493a70dc932f530d4a765cf50063e86927c8f 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -50,6 +50,7 @@
 #define VLC_CODEC_WMVP            VLC_FOURCC('W','M','V','P')
 #define VLC_CODEC_WMVP2           VLC_FOURCC('W','V','P','2')
 #define VLC_CODEC_VC1             VLC_FOURCC('V','C','-','1')
+#define VLC_CODEC_DAALA           VLC_FOURCC('d','a','a','l')
 #define VLC_CODEC_THEORA          VLC_FOURCC('t','h','e','o')
 #define VLC_CODEC_TARKIN          VLC_FOURCC('t','a','r','k')
 #define VLC_CODEC_DIRAC           VLC_FOURCC('d','r','a','c')
@@ -168,6 +169,11 @@
 #define VLC_CODEC_TGQ             VLC_FOURCC('T','G','Q','V')
 #define VLC_CODEC_TQI             VLC_FOURCC('T','Q','I','V')
 #define VLC_CODEC_MAD             VLC_FOURCC('M','A','D','V')
+#define VLC_CODEC_ANM             VLC_FOURCC('A','N','I','M')
+#define VLC_CODEC_YOP             VLC_FOURCC('Y','O','P','V')
+#define VLC_CODEC_JV              VLC_FOURCC('J','V','0','0')
+#define VLC_CODEC_DFA             VLC_FOURCC('D','F','I','A')
+#define VLC_CODEC_HNM4_VIDEO      VLC_FOURCC('H','N','M','4')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
@@ -395,6 +401,7 @@
 #define VLC_CODEC_S8                         VLC_FOURCC('s','8',' ',' ')
 #define VLC_CODEC_U8                         VLC_FOURCC('u','8',' ',' ')
 #define VLC_CODEC_S16L                       VLC_FOURCC('s','1','6','l')
+#define VLC_CODEC_S16L_PLANAR                VLC_FOURCC('s','1','l','p')
 #define VLC_CODEC_S16B                       VLC_FOURCC('s','1','6','b')
 #define VLC_CODEC_U16L                       VLC_FOURCC('u','1','6','l')
 #define VLC_CODEC_U16B                       VLC_FOURCC('u','1','6','b')
@@ -429,6 +436,7 @@
 #define VLC_CODEC_SMACKAUDIO                 VLC_FOURCC('S','M','K','A')
 #define VLC_CODEC_ADPCM_IMA_EA_SEAD          VLC_FOURCC('S','E','A','D')
 #define VLC_CODEC_ADPCM_EA_R1                VLC_FOURCC('E','A','R','1')
+#define VLC_CODEC_ADPCM_IMA_APC              VLC_FOURCC('A','I','P','C')
 
 /* Subtitle */
 #define VLC_CODEC_SPU       VLC_FOURCC('s','p','u',' ')
@@ -445,11 +453,18 @@
 #define VLC_CODEC_OGT       VLC_FOURCC('o','g','t',' ')
 #define VLC_CODEC_CVD       VLC_FOURCC('c','v','d',' ')
 #define VLC_CODEC_TX3G      VLC_FOURCC('t','x','3','g')
+#define VLC_CODEC_ARIB_A    VLC_FOURCC('a','r','b','a')
+#define VLC_CODEC_ARIB_C    VLC_FOURCC('a','r','b','c')
 /* Blu-ray Presentation Graphics */
 #define VLC_CODEC_BD_PG     VLC_FOURCC('b','d','p','g')
 /* EBU STL (TECH. 3264-E) */
 #define VLC_CODEC_EBU_STL   VLC_FOURCC('S','T','L',' ')
 #define VLC_CODEC_SCTE_27   VLC_FOURCC('S','C','2','7')
+/* EIA-608 */
+#define VLC_CODEC_EIA608_1  VLC_FOURCC('c','c','1',' ')
+#define VLC_CODEC_EIA608_2  VLC_FOURCC('c','c','2',' ')
+#define VLC_CODEC_EIA608_3  VLC_FOURCC('c','c','3',' ')
+#define VLC_CODEC_EIA608_4  VLC_FOURCC('c','c','4',' ')
 
 /* XYZ colorspace 12 bits packed in 16 bits, organisation |XXX0|YYY0|ZZZ0| */
 #define VLC_CODEC_XYZ12     VLC_FOURCC('X','Y','1','2')