vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Fri Jun 8 16:13:45 2012 +0200| [1c3283dc460cd61c7a41441b8c7a90b6942cc9d0] | committer: Jean-Baptiste Kempf
Add Indeo Audio codecs and wave format tags > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1c3283dc460cd61c7a41441b8c7a90b6942cc9d0 --- include/vlc_codecs.h | 3 +++ include/vlc_fourcc.h | 1 + src/misc/fourcc.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h index f2ef74f..373adac 100644 --- a/include/vlc_codecs.h +++ b/include/vlc_codecs.h @@ -250,6 +250,8 @@ ATTR_PACKED #define WAVE_FORMAT_ATRAC3 0x0270 /* Atrac3, != from MSDN doc */ #define WAVE_FORMAT_SONY_ATRAC3 0x0272 /* Atrac3, != from MSDN doc */ +#define WAVE_FORMAT_INDEO_AUDIO 0x0402 /* Indeo Audio Coder */ + #define WAVE_FORMAT_AAC_2 0x1601 /* Other AAC */ #define WAVE_FORMAT_AAC_LATM 0x1602 /* AAC/LATM */ @@ -386,6 +388,7 @@ wave_format_tag_to_fourcc[] = { WAVE_FORMAT_GSM_AMR, VLC_CODEC_AMR_NB, "GSM-AMR Audio VBR, SID" }, { WAVE_FORMAT_ULEAD_DV_AUDIO_NTSC, VLC_CODEC_ULEAD_DV_AUDIO_NTSC, "Ulead DV audio NTSC" }, { WAVE_FORMAT_ULEAD_DV_AUDIO_PAL, VLC_CODEC_ULEAD_DV_AUDIO_PAL, "Ulead DV audio PAL" }, + { WAVE_FORMAT_INDEO_AUDIO, VLC_CODEC_INDEO_AUDIO, "Indeo Audio Coder" }, { WAVE_FORMAT_UNKNOWN, VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" } }; diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index 19b08fa..51ef78a 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -332,6 +332,7 @@ #define VLC_CODEC_BMVAUDIO VLC_FOURCC('B','M','V','A') #define VLC_CODEC_ULEAD_DV_AUDIO_NTSC VLC_FOURCC('m','s',0x02,0x15) #define VLC_CODEC_ULEAD_DV_AUDIO_PAL VLC_FOURCC('m','s',0x02,0x16) +#define VLC_CODEC_INDEO_AUDIO VLC_FOURCC('m','s',0x04,0x02) /* Subtitle */ #define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ') diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c index 87bbe93..a510aee 100644 --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -1290,6 +1290,9 @@ static const entry_t p_list_audio[] = { B(VLC_CODEC_ULEAD_DV_AUDIO_PAL, "Ulead DV audio PAL"), A("ms\x02\x16"), + B(VLC_CODEC_INDEO_AUDIO, "Indeo Audio Coder"), + A("ms\x04\x02"), + B(0, "") }; static const entry_t p_list_spu[] = { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
