From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sat, 18 Jul 2009 17:48:46 +0000 (+0200)
Subject: Support for ADPCM variant in Flash streams
X-Git-Tag: 1.1.0-ff~4911
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=42abe204599924610c2b17ec28e23d62e22a32ae;p=vlc

Support for ADPCM variant in Flash streams

Sample: http://streams.videolan.org/streams-videolan/flv/Porgi_Amor_Mirusia_123nl_Orbit.flv
This could be backported, if someone needs it.
---

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 0fe0c2dd97..8c5a12b9d4 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -220,6 +220,7 @@
 #define VLC_CODEC_ADPCM_IMA_WS VLC_FOURCC('A','I','W','S')
 #define VLC_CODEC_VMDAUDIO  VLC_FOURCC('v','m','d','a')
 #define VLC_CODEC_ADPCM_G726 VLC_FOURCC('g','7','2','6')
+#define VLC_CODEC_ADPCM_SWF VLC_FOURCC('S','W','F','a')
 #define VLC_CODEC_AMR_NB    VLC_FOURCC('s','a','m','r')
 #define VLC_CODEC_AMR_WB    VLC_FOURCC('s','a','w','b')
 #define VLC_CODEC_ALAC      VLC_FOURCC('a','l','a','c')
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 51d0c598f6..f0965b2685 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -330,6 +330,7 @@ static const struct
     { VLC_CODEC_VMDAUDIO, CODEC_ID_VMDAUDIO, AUDIO_ES },
 
     { VLC_CODEC_ADPCM_G726, CODEC_ID_ADPCM_G726, AUDIO_ES },
+    { VLC_CODEC_ADPCM_SWF, CODEC_ID_ADPCM_SWF, AUDIO_ES },
 
     { VLC_CODEC_AMR_NB, CODEC_ID_AMR_NB, AUDIO_ES },
     { VLC_CODEC_AMR_WB, CODEC_ID_AMR_WB, AUDIO_ES },
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index aaf31f97bc..d9702399fe 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -901,6 +901,11 @@ static const entry_t p_list_audio[] = {
     B(VLC_CODEC_ADPCM_G726, "G.726 ADPCM Audio"),
         A("g726"),
 
+    /* G.726 ADPCM */
+    B(VLC_CODEC_ADPCM_SWF, "Flash ADPCM Audio"),
+        A("SWFa"),
+
+
     /* AMR */
     B(VLC_CODEC_AMR_NB, "AMR narrow band"),
         A("samr"),