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

avcodec: map Wing commander IV Xxan video

Sample: http://samples.mplayerhq.hu/game-formats/wc4-xan/wc4trailer.avi

Audio does not work for this sample; it is recognized as raw PCM instead
of the special Xan DPCM codec (the avformat AVI demuxer has a special
case for recognizing this audio codec that is not in the native VLC AVI
demux).
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent c8e99546
......@@ -139,6 +139,7 @@
#define VLC_CODEC_BINKVIDEO VLC_FOURCC('B','I','K','f')
#define VLC_CODEC_BINKAUDIO_DCT VLC_FOURCC('B','A','U','1')
#define VLC_CODEC_BINKAUDIO_RDFT VLC_FOURCC('B','A','U','2')
#define VLC_CODEC_XAN_WC4 VLC_FOURCC('X','x','a','n')
/* Planar YUV 4:1:0 Y:V:U */
#define VLC_CODEC_YV9 VLC_FOURCC('Y','V','U','9')
......
......@@ -92,7 +92,7 @@ static const struct
{ VLC_CODEC_ROQ, AV_CODEC_ID_ROQ, VIDEO_ES },
{ VLC_CODEC_INTERPLAY, AV_CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },
/* AV_CODEC_ID_XAN_WC3 */
/* AV_CODEC_ID_XAN_WC4 */
{ VLC_CODEC_XAN_WC4, AV_CODEC_ID_XAN_WC4, VIDEO_ES },
{ VLC_CODEC_RPZA, AV_CODEC_ID_RPZA, VIDEO_ES },
{ VLC_CODEC_CINEPAK, AV_CODEC_ID_CINEPAK, VIDEO_ES },
/* AV_CODEC_ID_WS_VQA */
......
......@@ -999,6 +999,9 @@ static const staticentry_t p_list_video[] = {
B(VLC_CODEC_MTS2, "Microsoft Expression Encoder Screen"),
A("MTS2"),
B(VLC_CODEC_XAN_WC4, "Wing Commander IV Xan video"),
A("Xxan"),
B(0, "")
};
static const staticentry_t p_list_audio[] = {
......
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