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

avcodec: map YOP video and ADPCM IMA APC

Sample:
http://fate-suite.libav.org/yop/test1.yopSigned-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 679fa3a0
......@@ -169,6 +169,7 @@
#define VLC_CODEC_TQI VLC_FOURCC('T','Q','I','V')
#define VLC_CODEC_MAD VLC_FOURCC('M','A','D','V')
#define VLC_CODEC_ANM VLC_FOURCC('A','N','I','M')
#define VLC_CODEC_YOP VLC_FOURCC('Y','O','P','V')
/* Planar YUV 4:1:0 Y:V:U */
#define VLC_CODEC_YV9 VLC_FOURCC('Y','V','U','9')
......@@ -431,6 +432,7 @@
#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')
#define VLC_CODEC_ADPCM_IMA_APC VLC_FOURCC('A','I','P','C')
/* Subtitle */
#define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ')
......
......@@ -193,7 +193,7 @@ static const struct
/* AV_CODEC_ID_IFF_ILBM */
/* AV_CODEC_ID_IFF_BYTERUN1 */
{ VLC_CODEC_KGV1, AV_CODEC_ID_KGV1, VIDEO_ES },
/* AV_CODEC_ID_YOP */
{ VLC_CODEC_YOP, AV_CODEC_ID_YOP, VIDEO_ES },
{ VLC_CODEC_VP8, AV_CODEC_ID_VP8, VIDEO_ES },
/* AV_CODEC_ID_PICTOR */
/* AV_CODEC_ID_ANSI */
......@@ -349,7 +349,7 @@ static const struct
/* AV_CODEC_ID_ADPCM_EA_MAXIS_XA */
/* AV_CODEC_ID_ADPCM_IMA_ISS */
{ VLC_CODEC_ADPCM_G722, AV_CODEC_ID_ADPCM_G722, AUDIO_ES },
/* AV_CODEC_ID_ADPCM_IMA_APC */
{ VLC_CODEC_ADPCM_IMA_APC, AV_CODEC_ID_ADPCM_IMA_APC, AUDIO_ES },
/* ffmpeg only: AV_CODEC_ID_VIMA */
/* ffmpeg only: AV_CODEC_ID_ADPCM_AFC */
/* ffmpeg only: AV_CODEC_ID_ADPCM_IMA_OKI */
......
......@@ -1097,6 +1097,8 @@ static const staticentry_t p_list_video[] = {
B(VLC_CODEC_ANM, "DeluxePaint animation"),
B(VLC_CODEC_YOP, "Psygnosis YOP"),
B(0, "")
};
static const staticentry_t p_list_audio[] = {
......@@ -1500,6 +1502,8 @@ static const staticentry_t p_list_audio[] = {
B(VLC_CODEC_ADPCM_EA_R1, "ADPCM Electronic Arts R1"),
B(VLC_CODEC_ADPCM_IMA_APC, "ADPCM APC"),
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