Skip to content

V
vlc
Commit e828c982 authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

fourcc: add missing creative adpcm codecs

parent f6db0768
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
include/vlc_fourcc.h
View file @ e828c982
...@@ -395,6 +395,9 @@ ...@@ -395,6 +395,9 @@
#define VLC_CODEC_ADPCM_YAMAHA VLC_FOURCC('m','s',0x00,0x20) #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_DK3 VLC_FOURCC('m','s',0x00,0x62)
#define VLC_CODEC_ADPCM_DK4 VLC_FOURCC('m','s',0x00,0x61) #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_ADPCM_THP VLC_FOURCC('T','H','P','A')
#define VLC_CODEC_G723_1 VLC_FOURCC('g','7','2', 0x31) #define VLC_CODEC_G723_1 VLC_FOURCC('g','7','2', 0x31)
#define VLC_CODEC_G729 VLC_FOURCC('g','7','2','9') #define VLC_CODEC_G729 VLC_FOURCC('g','7','2','9')
......
modules/codec/avcodec/fourcc.c
View file @ e828c982
...@@ -347,9 +347,9 @@ static const struct ...@@ -347,9 +347,9 @@ static const struct
/* AV_CODEC_ID_ADPCM_CT */ /* AV_CODEC_ID_ADPCM_CT */
{ VLC_CODEC_ADPCM_SWF, AV_CODEC_ID_ADPCM_SWF, AUDIO_ES }, { VLC_CODEC_ADPCM_SWF, AV_CODEC_ID_ADPCM_SWF, AUDIO_ES },
{ VLC_CODEC_ADPCM_YAMAHA, AV_CODEC_ID_ADPCM_YAMAHA, AUDIO_ES }, { VLC_CODEC_ADPCM_YAMAHA, AV_CODEC_ID_ADPCM_YAMAHA, AUDIO_ES },
/* AV_CODEC_ID_ADPCM_SBPRO_4 */ { VLC_CODEC_ADPCM_SBPRO_4, AV_CODEC_ID_ADPCM_SBPRO_4, AUDIO_ES },
/* AV_CODEC_ID_ADPCM_SBPRO_3 */ { VLC_CODEC_ADPCM_SBPRO_3, AV_CODEC_ID_ADPCM_SBPRO_3, AUDIO_ES },
/* AV_CODEC_ID_ADPCM_SBPRO_2 */ { 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_THP, AV_CODEC_ID_ADPCM_THP, AUDIO_ES },
{ VLC_CODEC_ADPCM_IMA_AMV, AV_CODEC_ID_ADPCM_IMA_AMV, 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_CODEC_ADPCM_EA_R1, AV_CODEC_ID_ADPCM_EA_R1, AUDIO_ES },
......
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