Commit 75292985 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jean-Baptiste Kempf

avcodec: map EA MAD and EA ADPCM R1

Sample:
http://fate-suite.libav.org/ea-mad/NFS6LogoE.madSigned-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent c7a51a6b
......@@ -166,6 +166,8 @@
#define VLC_CODEC_MOTIONPIXELS VLC_FOURCC('M','P','I','X')
#define VLC_CODEC_TGV VLC_FOURCC('T','G','V','V')
#define VLC_CODEC_TGQ VLC_FOURCC('T','G','Q','V')
#define VLC_CODEC_TQI VLC_FOURCC('T','Q','I','V')
#define VLC_CODEC_MAD VLC_FOURCC('M','A','D','V')
/* Planar YUV 4:1:0 Y:V:U */
#define VLC_CODEC_YV9 VLC_FOURCC('Y','V','U','9')
......@@ -426,6 +428,7 @@
#define VLC_CODEC_TAK VLC_FOURCC('t','a','k',' ')
#define VLC_CODEC_SMACKAUDIO VLC_FOURCC('S','M','K','A')
#define VLC_CODEC_ADPCM_IMA_EA_SEAD VLC_FOURCC('S','E','A','D')
#define VLC_CODEC_ADPCM_EA_R1 VLC_FOURCC('E','A','R','1')
/* Subtitle */
#define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ')
......
......@@ -176,14 +176,14 @@ static const struct
{ VLC_CODEC_MOTIONPIXELS, AV_CODEC_ID_MOTIONPIXELS, VIDEO_ES },
{ VLC_CODEC_TGV, AV_CODEC_ID_TGV, VIDEO_ES },
{ VLC_CODEC_TGQ, AV_CODEC_ID_TGQ, VIDEO_ES },
/* AV_CODEC_ID_TQI */
{ VLC_CODEC_TQI, AV_CODEC_ID_TQI, VIDEO_ES },
{ VLC_CODEC_AURA, AV_CODEC_ID_AURA, VIDEO_ES },
/* AV_CODEC_ID_AURA2 */
/* AV_CODEC_ID_V210X */
{ VLC_CODEC_TMV, AV_CODEC_ID_TMV, VIDEO_ES },
{ VLC_CODEC_V210, AV_CODEC_ID_V210, VIDEO_ES },
/* AV_CODEC_ID_DPX */
/* AV_CODEC_ID_MAD */
{ VLC_CODEC_MAD, AV_CODEC_ID_MAD, VIDEO_ES },
{ VLC_CODEC_FRWU, AV_CODEC_ID_FRWU, VIDEO_ES },
{ VLC_CODEC_FLASHSV2, AV_CODEC_ID_FLASHSV2, VIDEO_ES },
/* AV_CODEC_ID_CDGRAPHICS */
......@@ -340,7 +340,7 @@ static const struct
/* AV_CODEC_ID_ADPCM_SBPRO_2 */
{ VLC_CODEC_ADPCM_THP, AV_CODEC_ID_ADPCM_THP, AUDIO_ES },
{ VLC_CODEC_ADPCM_IMA_AMV, AV_CODEC_ID_ADPCM_IMA_AMV, AUDIO_ES },
/* AV_CODEC_ID_ADPCM_EA_R1 */
{ VLC_CODEC_ADPCM_EA_R1, AV_CODEC_ID_ADPCM_EA_R1, AUDIO_ES },
/* AV_CODEC_ID_ADPCM_EA_R3 */
/* AV_CODEC_ID_ADPCM_EA_R2 */
{ VLC_CODEC_ADPCM_IMA_EA_SEAD, AV_CODEC_ID_ADPCM_IMA_EA_SEAD, AUDIO_ES },
......
......@@ -1091,6 +1091,10 @@ static const staticentry_t p_list_video[] = {
B(VLC_CODEC_TGQ, "Electronic Arts TGQ"),
B(VLC_CODEC_TQI, "Electronic Arts TQI"),
B(VLC_CODEC_MAD, "Electronic Arts MAD"),
B(0, "")
};
static const staticentry_t p_list_audio[] = {
......@@ -1490,6 +1494,8 @@ static const staticentry_t p_list_audio[] = {
B(VLC_CODEC_ADPCM_IMA_EA_SEAD, "ADPCM IMA Electronic Arts SEAD"),
B(VLC_CODEC_ADPCM_EA_R1, "ADPCM Electronic Arts R1"),
B(0, "")
};
static const staticentry_t p_list_spu[] = {
......
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