[vlc-commits] Add Yamaha ADPCM variant 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:59 2012 +0200| [df8db6ac961881bd9c55f15723c5e385c0107f01] | committer: Jean-Baptiste Kempf

Add Yamaha ADPCM variant Fourcc

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

 include/vlc_fourcc.h |    1 +
 src/misc/fourcc.c    |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index dc5412f..3a5d0b8 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -273,6 +273,7 @@
 #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_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')
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 30ce17b..5406f0f 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1090,6 +1090,9 @@ static const entry_t p_list_audio[] = {
     B(VLC_CODEC_ADPCM_IMA_AMV, "IMA AMV ADPCM Audio"),
         A("imav"),
 
+    B(VLC_CODEC_ADPCM_YAMAHA, "Yamaha ADPCM Audio" ),
+        A("ms\x00\x20"),
+
     /* AMR */
     B(VLC_CODEC_AMR_NB, "AMR narrow band"),
         A("samr"),



More information about the vlc-commits mailing list