vlc_UrlParse: rewrite, de-inline and simplify

[vlc] / include / vlc_fourcc.h

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 4aa46a5c231b20ad1a64d8e5bf611a8c7c4af851..fd7b9ecc5e3a86e755a7c5f5313a9b36f353f344 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -71,7 +71,6 @@
 #define VLC_CODEC_SP5X      VLC_FOURCC('S','P','5','X')
 #define VLC_CODEC_DV        VLC_FOURCC('d','v',' ',' ')
 #define VLC_CODEC_MSRLE     VLC_FOURCC('m','r','l','e')
-#define VLC_CODEC_INDEO3    VLC_FOURCC('I','V','3','1')
 #define VLC_CODEC_HUFFYUV   VLC_FOURCC('H','F','Y','U')
 #define VLC_CODEC_FFVHUFF   VLC_FOURCC('F','F','V','H')
 #define VLC_CODEC_ASV1      VLC_FOURCC('A','S','V','1')
@@ -98,6 +97,9 @@
 #define VLC_CODEC_WNV1      VLC_FOURCC('W','N','V','1')
 #define VLC_CODEC_AASC      VLC_FOURCC('A','A','S','C')
 #define VLC_CODEC_INDEO2    VLC_FOURCC('I','V','2','0')
+#define VLC_CODEC_INDEO3    VLC_FOURCC('I','V','3','1')
+#define VLC_CODEC_INDEO4    VLC_FOURCC('I','V','4','1')
+#define VLC_CODEC_INDEO5    VLC_FOURCC('I','V','5','0')
 #define VLC_CODEC_FLASHSV   VLC_FOURCC('F','S','V','1')
 #define VLC_CODEC_KMVC      VLC_FOURCC('K','M','V','C')
 #define VLC_CODEC_SMACKVIDEO VLC_FOURCC('S','M','K','2')
@@ -113,12 +115,22 @@
 #define VLC_CODEC_CDG       VLC_FOURCC('C','D','G',' ')
 #define VLC_CODEC_FRWU      VLC_FOURCC('F','R','W','U')
 #define VLC_CODEC_AMV       VLC_FOURCC('A','M','V',' ')
-#define VLC_CODEC_INDEO5    VLC_FOURCC('I','V','5','0')
 #define VLC_CODEC_VP8       VLC_FOURCC('V','P','8','0')
 #define VLC_CODEC_JPEG2000  VLC_FOURCC('J','P','2','K')
 #define VLC_CODEC_LAGARITH  VLC_FOURCC('L','A','G','S')
 #define VLC_CODEC_FLASHSV2  VLC_FOURCC('F','S','V','2')
 #define VLC_CODEC_PRORES    VLC_FOURCC('a','p','c','n')
+#define VLC_CODEC_MXPEG     VLC_FOURCC('M','X','P','G')
+#define VLC_CODEC_CDXL      VLC_FOURCC('C','D','X','L')
+#define VLC_CODEC_BMVVIDEO  VLC_FOURCC('B','M','V','V')
+#define VLC_CODEC_UTVIDEO   VLC_FOURCC('U','L','R','A')
+#define VLC_CODEC_VBLE      VLC_FOURCC('V','B','L','E')
+#define VLC_CODEC_DXTORY    VLC_FOURCC('x','t','o','r')
+#define VLC_CODEC_MSS1      VLC_FOURCC('M','S','S','1')
+#define VLC_CODEC_MSS2      VLC_FOURCC('M','S','S','2')
+#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')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9       VLC_FOURCC('Y','V','U','9')
@@ -245,6 +257,7 @@
 #define VLC_CODEC_TRUEHD    VLC_FOURCC('t','r','h','d')
 #define VLC_CODEC_DVAUDIO   VLC_FOURCC('d','v','a','u')
 #define VLC_CODEC_SPEEX     VLC_FOURCC('s','p','x',' ')
+#define VLC_CODEC_OPUS      VLC_FOURCC('O','p','u','s')
 #define VLC_CODEC_VORBIS    VLC_FOURCC('v','o','r','b')
 #define VLC_CODEC_MACE3     VLC_FOURCC('M','A','C','3')
 #define VLC_CODEC_MACE6     VLC_FOURCC('M','A','C','6')
@@ -252,11 +265,11 @@
 #define VLC_CODEC_MUSEPACK8 VLC_FOURCC('M','P','C','K')
 #define VLC_CODEC_RA_144    VLC_FOURCC('1','4','_','4')
 #define VLC_CODEC_RA_288    VLC_FOURCC('2','8','_','8')
-#define VLC_CODEC_ADPCM_4XM VLC_FOURCC('4','x','m','a')
-#define VLC_CODEC_ADPCM_EA  VLC_FOURCC('A','D','E','A')
 #define VLC_CODEC_INTERPLAY_DPCM VLC_FOURCC('i','d','p','c')
 #define VLC_CODEC_ROQ_DPCM  VLC_FOURCC('R','o','Q','a')
 #define VLC_CODEC_DSICINAUDIO VLC_FOURCC('D','C','I','A')
+#define VLC_CODEC_ADPCM_4XM VLC_FOURCC('4','x','m','a')
+#define VLC_CODEC_ADPCM_EA  VLC_FOURCC('A','D','E','A')
 #define VLC_CODEC_ADPCM_XA  VLC_FOURCC('x','a',' ',' ')
 #define VLC_CODEC_ADPCM_ADX VLC_FOURCC('a','d','x',' ')
 #define VLC_CODEC_ADPCM_IMA_WS VLC_FOURCC('A','I','W','S')
@@ -265,6 +278,9 @@
 #define VLC_CODEC_ADPCM_SWF VLC_FOURCC('S','W','F','a')
 #define VLC_CODEC_ADPCM_MS  VLC_FOURCC('m','s',0x00,0x02)
 #define VLC_CODEC_ADPCM_IMA_WAV VLC_FOURCC('m','s',0x00,0x11)
+#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_VMDAUDIO  VLC_FOURCC('v','m','d','a')
 #define VLC_CODEC_AMR_NB    VLC_FOURCC('s','a','m','r')
 #define VLC_CODEC_AMR_WB    VLC_FOURCC('s','a','w','b')
@@ -291,6 +307,8 @@
 #define VLC_CODEC_BD_LPCM   VLC_FOURCC('b','p','c','m')
 #define VLC_CODEC_SDDS      VLC_FOURCC('s','d','d','s')
 #define VLC_CODEC_MIDI      VLC_FOURCC('M','I','D','I')
+#define VLC_CODEC_RALF      VLC_FOURCC('R','A','L','F')
+
 #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')
@@ -317,7 +335,10 @@
 #define VLC_CODEC_S24DAUD   VLC_FOURCC('d','a','u','d')
 #define VLC_CODEC_FI32      VLC_FOURCC('f','i','3','2')
 #define VLC_CODEC_TWINVQ    VLC_FOURCC('T','W','I','N')
-#define VLC_CODEC_ADPCM_IMA_AMV VLC_FOURCC('i','m','a','v')
+#define VLC_CODEC_BMVAUDIO  VLC_FOURCC('B','M','V','A')
+#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)
 
 /* Subtitle */
 #define VLC_CODEC_SPU       VLC_FOURCC('s','p','u',' ')