Commit 42abe204 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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.
parent 306d8aff
......@@ -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')
......
......@@ -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 },
......
......@@ -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"),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment