[vlc-commits] Group ADPCM fourcc

Jean-Baptiste Kempf git at videolan.org
Fri Apr 13 01:08:10 CEST 2012


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Apr 13 00:44:12 2012 +0200| [56f2c81790bda3b94b934b43095410a356e6c58f] | committer: Jean-Baptiste Kempf

Group ADPCM fourcc

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=56f2c81790bda3b94b934b43095410a356e6c58f
---

 include/vlc_fourcc.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 47ee089..dc5412f 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -259,11 +259,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')
@@ -272,6 +272,7 @@
 #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_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')
@@ -326,7 +327,6 @@
 #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')
 
 /* Subtitle */



More information about the vlc-commits mailing list