livehttp: fix memory leak (cid #1048908)

[vlc] / include / vlc_fourcc.h

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 67413dda718785dfd5e8e02d06970040c134271b..abbfb1217b47160ef8cdd9440c7beac08b311086 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -52,7 +52,6 @@
 #define VLC_CODEC_VC1             VLC_FOURCC('V','C','-','1')
 #define VLC_CODEC_THEORA          VLC_FOURCC('t','h','e','o')
 #define VLC_CODEC_TARKIN          VLC_FOURCC('t','a','r','k')
-#define VLC_CODEC_SNOW            VLC_FOURCC('S','N','O','W')
 #define VLC_CODEC_DIRAC           VLC_FOURCC('d','r','a','c')
 #define VLC_CODEC_CAVS            VLC_FOURCC('C','A','V','S')
 #define VLC_CODEC_NUV             VLC_FOURCC('N','J','P','G')
@@ -131,6 +130,12 @@
 #define VLC_CODEC_MSA1            VLC_FOURCC('M','S','A','1')
 #define VLC_CODEC_TSC2            VLC_FOURCC('T','S','C','2')
 #define VLC_CODEC_MTS2            VLC_FOURCC('M','T','S','2')
+#define VLC_CODEC_HEVC            VLC_FOURCC('h','e','v','c')
+#define VLC_CODEC_VP9             VLC_FOURCC('V','P','9','0')
+#define VLC_CODEC_ICOD            VLC_FOURCC('i','c','o','d')
+#define VLC_CODEC_G2M2            VLC_FOURCC('G','2','M','2')
+#define VLC_CODEC_G2M3            VLC_FOURCC('G','2','M','3')
+#define VLC_CODEC_G2M4            VLC_FOURCC('G','2','M','4')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
@@ -202,6 +207,8 @@
 #define VLC_CODEC_RGB32           VLC_FOURCC('R','V','3','2')
 /* 32 bits RGBA */
 #define VLC_CODEC_RGBA            VLC_FOURCC('R','G','B','A')
+/* 32 bits ARGB */
+#define VLC_CODEC_ARGB            VLC_FOURCC('A','R','G','B')
 /* 8 bits grey */
 #define VLC_CODEC_GREY            VLC_FOURCC('G','R','E','Y')
 /* Packed YUV 4:2:2, U:Y:V:Y */
@@ -226,6 +233,19 @@
 #define VLC_CODEC_NV16            VLC_FOURCC('N','V','1','6')
 /* 2 planes Y/VU 4:2:2 */
 #define VLC_CODEC_NV61            VLC_FOURCC('N','V','6','1')
+/* 2 planes Y/UV 4:4:4 */
+#define VLC_CODEC_NV24            VLC_FOURCC('N','V','2','4')
+/* 2 planes Y/VU 4:4:4 */
+#define VLC_CODEC_NV42            VLC_FOURCC('N','V','4','2')
+
+/* VDPAU video surface YCbCr 4:2:0 */
+#define VLC_CODEC_VDPAU_VIDEO_420 VLC_FOURCC('V','D','V','0')
+/* VDPAU video surface YCbCr 4:2:2 */
+#define VLC_CODEC_VDPAU_VIDEO_422 VLC_FOURCC('V','D','V','2')
+/* VDPAU video surface YCbCr 4:4:4 */
+#define VLC_CODEC_VDPAU_VIDEO_444 VLC_FOURCC('V','D','V','4')
+/* VDPAU output surface RGBA */
+#define VLC_CODEC_VDPAU_OUTPUT    VLC_FOURCC('V','D','O','R')
 
 /* Image codec (video) */
 #define VLC_CODEC_PNG             VLC_FOURCC('p','n','g',' ')
@@ -286,6 +306,8 @@
 #define VLC_CODEC_ADPCM_IMA_AMV              VLC_FOURCC('i','m','a','v')
 #define VLC_CODEC_ADPCM_IMA_QT               VLC_FOURCC('i','m','a','4')
 #define VLC_CODEC_ADPCM_YAMAHA               VLC_FOURCC('m','s',0x00,0x20)
+#define VLC_CODEC_ADPCM_DK3                  VLC_FOURCC('m','s',0x00,0x62)
+#define VLC_CODEC_ADPCM_DK4                  VLC_FOURCC('m','s',0x00,0x61)
 #define VLC_CODEC_G723_1                     VLC_FOURCC('g','7','2', 0x31)
 #define VLC_CODEC_G729                       VLC_FOURCC('g','7','2','9')
 #define VLC_CODEC_VMDAUDIO                   VLC_FOURCC('v','m','d','a')
@@ -302,7 +324,6 @@
 #define VLC_CODEC_GSM_MS                     VLC_FOURCC('a','g','s','m')
 #define VLC_CODEC_ATRAC1                     VLC_FOURCC('a','t','r','1')
 #define VLC_CODEC_ATRAC3                     VLC_FOURCC('a','t','r','c')
-#define VLC_CODEC_SONIC                      VLC_FOURCC('S','O','N','C')
 #define VLC_CODEC_IMC                        VLC_FOURCC(0x1,0x4,0x0,0x0)
 #define VLC_CODEC_TRUESPEECH                 VLC_FOURCC(0x22,0x0,0x0,0x0)
 #define VLC_CODEC_NELLYMOSER                 VLC_FOURCC('N','E','L','L')
@@ -347,6 +368,7 @@
 #define VLC_CODEC_ULEAD_DV_AUDIO_NTSC        VLC_FOURCC('m','s',0x02,0x15)
 #define VLC_CODEC_ULEAD_DV_AUDIO_PAL         VLC_FOURCC('m','s',0x02,0x16)
 #define VLC_CODEC_INDEO_AUDIO                VLC_FOURCC('m','s',0x04,0x02)
+#define VLC_CODEC_METASOUND                  VLC_FOURCC('m','s',0x00,0x75)
 
 /* Subtitle */
 #define VLC_CODEC_SPU       VLC_FOURCC('s','p','u',' ')
@@ -368,6 +390,9 @@
 #define VLC_CODEC_EBU_STL   VLC_FOURCC('S','T','L',' ')
 #define VLC_CODEC_SCTE_27   VLC_FOURCC('S','C','2','7')
 
+/* XYZ colorspace 12 bits packed in 16 bits, organisation |XXX0|YYY0|ZZZ0| */
+#define VLC_CODEC_XYZ12     VLC_FOURCC('X','Y','1','2')
+
 
 /* Special endian dependant values
  * The suffic N means Native