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

Map ON2 AVC audio codec

parent 4c1392b3
......@@ -261,12 +261,15 @@ ATTR_PACKED
#define WAVE_FORMAT_IMC 0x0401
#define WAVE_FORMAT_INDEO_AUDIO 0x0402 /* Indeo Audio Coder */
#define WAVE_FORMAT_ON2_AVC 0x0500 /* VP7 */
#define WAVE_FORMAT_ON2_AVC_2 0x0500 /* VP6 */
#define WAVE_FORMAT_AAC_2 0x1601 /* Other AAC */
#define WAVE_FORMAT_AAC_LATM 0x1602 /* AAC/LATM */
#define WAVE_FORMAT_A52 0x2000 /* a52 */
#define WAVE_FORMAT_DTS 0x2001 /* DTS */
#define WAVE_FORMAT_AVCODEC_AAC 0x706D
#define WAVE_FORMAT_AVCODEC_AAC 0x706D
#define WAVE_FORMAT_DIVIO_AAC 0x4143 /* Divio's AAC */
#define WAVE_FORMAT_GSM_AMR_FIXED 0x7A21 /* Fixed bitrate, no SID */
......@@ -416,6 +419,8 @@ wave_format_tag_to_fourcc[] =
{ WAVE_FORMAT_IMC, VLC_CODEC_IMC, "IMC" },
{ WAVE_FORMAT_INDEO_AUDIO, VLC_CODEC_INDEO_AUDIO, "Indeo Audio Coder" },
{ WAVE_FORMAT_VOXWARE_RT29,VLC_CODEC_METASOUND, "VoxWare MetaSound" },
{ WAVE_FORMAT_ON2_AVC ,VLC_CODEC_ON2AVC, "On2 Audio for Video Codec (VP7)" },
{ WAVE_FORMAT_ON2_AVC_2 ,VLC_CODEC_ON2AVC, "On2 Audio for Video Codec (VP6)" },
{ WAVE_FORMAT_UNKNOWN, VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" }
};
......
......@@ -403,6 +403,7 @@
#define VLC_CODEC_ULEAD_DV_AUDIO_PAL VLC_FOURCC('m','s',0x02,0x16)
#define VLC_CODEC_INDEO_AUDIO VLC_FOURCC('m','s',0x04,0x02)
#define VLC_CODEC_METASOUND VLC_FOURCC('m','s',0x00,0x75)
#define VLC_CODEC_ON2AVC VLC_FOURCC('m','s',0x05,0x00)
/* Subtitle */
#define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ')
......
......@@ -457,6 +457,11 @@ static const struct
#if LIBAVCODEC_VERSION_CHECK( 55, 15, 0, 24, 100 )
{ VLC_CODEC_METASOUND, AV_CODEC_ID_METASOUND, AUDIO_ES },
#endif
/* AV_CODEC_ID_PAF_AUDIO */
#if LIBAVCODEC_VERSION_CHECK( 55, 49, 0, 59, 100 )
{ VLC_CODEC_ON2AVC, AV_CODEC_ID_ON2AVC, AUDIO_ES },
#endif
/* ffmpeg only: AV_CODEC_ID_FFWAVESYNTH */
/* ffmpeg only: AV_CODEC_ID_SONIC */
/* ffmpeg only: AV_CODEC_ID_SONIC_LS */
......
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