Commit b737cab7 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Codecs: map G.722 to avcodec decoder

Maybe .au demuxer should be modified accordingly
parent dab00991
...@@ -227,6 +227,7 @@ ...@@ -227,6 +227,7 @@
#define VLC_CODEC_ADPCM_XA VLC_FOURCC('x','a',' ',' ') #define VLC_CODEC_ADPCM_XA VLC_FOURCC('x','a',' ',' ')
#define VLC_CODEC_ADPCM_ADX VLC_FOURCC('a','d','x',' ') #define VLC_CODEC_ADPCM_ADX VLC_FOURCC('a','d','x',' ')
#define VLC_CODEC_ADPCM_IMA_WS VLC_FOURCC('A','I','W','S') #define VLC_CODEC_ADPCM_IMA_WS VLC_FOURCC('A','I','W','S')
#define VLC_CODEC_ADPCM_G722 VLC_FOURCC('g','7','2','2')
#define VLC_CODEC_ADPCM_G726 VLC_FOURCC('g','7','2','6') #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_ADPCM_SWF VLC_FOURCC('S','W','F','a')
#define VLC_CODEC_ADPCM_MS VLC_FOURCC('m','s',0x00,0x02) #define VLC_CODEC_ADPCM_MS VLC_FOURCC('m','s',0x00,0x02)
......
...@@ -354,6 +354,9 @@ static const struct ...@@ -354,6 +354,9 @@ static const struct
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 47, 0 ) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 47, 0 )
{ VLC_CODEC_SIPR, CODEC_ID_SIPR, AUDIO_ES }, { VLC_CODEC_SIPR, CODEC_ID_SIPR, AUDIO_ES },
#endif #endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 91, 0 )
{ VLC_CODEC_ADPCM_G722, CODEC_ID_ADPCM_G722, AUDIO_ES },
#endif
/* Lossless */ /* Lossless */
{ VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES }, { VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },
......
...@@ -937,6 +937,10 @@ static const entry_t p_list_audio[] = { ...@@ -937,6 +937,10 @@ static const entry_t p_list_audio[] = {
B(VLC_CODEC_ADPCM_G726, "G.726 ADPCM Audio"), B(VLC_CODEC_ADPCM_G726, "G.726 ADPCM Audio"),
A("g726"), A("g726"),
/* G.722 ADPCM */
B(VLC_CODEC_ADPCM_G722, "G.722 ADPCM Audio"),
A("g722"),
/* Flash ADPCM */ /* Flash ADPCM */
B(VLC_CODEC_ADPCM_SWF, "Flash ADPCM Audio"), B(VLC_CODEC_ADPCM_SWF, "Flash ADPCM Audio"),
A("SWFa"), A("SWFa"),
......
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