vlc | branch: master | Francois Cartegnie <[email protected]> | Wed Apr 15 12:46:18 2015 +0200| [e828c98254315c6384fee3fc53653017cc423d5f] | committer: Francois Cartegnie
fourcc: add missing creative adpcm codecs > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e828c98254315c6384fee3fc53653017cc423d5f --- include/vlc_fourcc.h | 3 +++ modules/codec/avcodec/fourcc.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index b982fa0..2d25095 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -395,6 +395,9 @@ #define VLC_CODEC_ADPCM_YAMAHA VLC_FOURCC('m','s',0x00,0x20) #define VLC_CODEC_ADPCM_DK3 VLC_FOURCC('m','s',0x00,0x62) #define VLC_CODEC_ADPCM_DK4 VLC_FOURCC('m','s',0x00,0x61) +#define VLC_CODEC_ADPCM_SBPRO_2 VLC_FOURCC('m','s',0x00,0xC2) +#define VLC_CODEC_ADPCM_SBPRO_3 VLC_FOURCC('m','s',0x00,0xC3) +#define VLC_CODEC_ADPCM_SBPRO_4 VLC_FOURCC('m','s',0x00,0xC4) #define VLC_CODEC_ADPCM_THP VLC_FOURCC('T','H','P','A') #define VLC_CODEC_G723_1 VLC_FOURCC('g','7','2', 0x31) #define VLC_CODEC_G729 VLC_FOURCC('g','7','2','9') diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index 61559ab..6bfa7eb 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -347,9 +347,9 @@ static const struct /* AV_CODEC_ID_ADPCM_CT */ { VLC_CODEC_ADPCM_SWF, AV_CODEC_ID_ADPCM_SWF, AUDIO_ES }, { VLC_CODEC_ADPCM_YAMAHA, AV_CODEC_ID_ADPCM_YAMAHA, AUDIO_ES }, - /* AV_CODEC_ID_ADPCM_SBPRO_4 */ - /* AV_CODEC_ID_ADPCM_SBPRO_3 */ - /* AV_CODEC_ID_ADPCM_SBPRO_2 */ + { VLC_CODEC_ADPCM_SBPRO_4, AV_CODEC_ID_ADPCM_SBPRO_4, AUDIO_ES }, + { VLC_CODEC_ADPCM_SBPRO_3, AV_CODEC_ID_ADPCM_SBPRO_3, AUDIO_ES }, + { VLC_CODEC_ADPCM_SBPRO_2, AV_CODEC_ID_ADPCM_SBPRO_2, AUDIO_ES }, { VLC_CODEC_ADPCM_THP, AV_CODEC_ID_ADPCM_THP, AUDIO_ES }, { VLC_CODEC_ADPCM_IMA_AMV, AV_CODEC_ID_ADPCM_IMA_AMV, AUDIO_ES }, { VLC_CODEC_ADPCM_EA_R1, AV_CODEC_ID_ADPCM_EA_R1, AUDIO_ES }, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
