Commit 23fb8f0f authored by Konstantin Pavlov's avatar Konstantin Pavlov

Register CDXL, BMV, Ut Video, VBLE and Dxtory codecs in avcodec module.

BMV Video requires palette support and doesnt work as-is, all other
codecs work nicely.
parent c8ed3d25
......@@ -121,6 +121,11 @@
#define VLC_CODEC_FLASHSV2 VLC_FOURCC('F','S','V','2')
#define VLC_CODEC_PRORES VLC_FOURCC('a','p','c','n')
#define VLC_CODEC_MXPEG VLC_FOURCC('M','X','P','G')
#define VLC_CODEC_CDXL VLC_FOURCC('C','D','X','L')
#define VLC_CODEC_BMVVIDEO VLC_FOURCC('B','M','V','V')
#define VLC_CODEC_UTVIDEO VLC_FOURCC('U','L','R','A')
#define VLC_CODEC_VBLE VLC_FOURCC('V','B','L','E')
#define VLC_CODEC_DXTORY VLC_FOURCC('x','t','o','r')
/* Planar YUV 4:1:0 Y:V:U */
#define VLC_CODEC_YV9 VLC_FOURCC('Y','V','U','9')
......@@ -320,6 +325,7 @@
#define VLC_CODEC_FI32 VLC_FOURCC('f','i','3','2')
#define VLC_CODEC_TWINVQ VLC_FOURCC('T','W','I','N')
#define VLC_CODEC_ADPCM_IMA_AMV VLC_FOURCC('i','m','a','v')
#define VLC_CODEC_BMVAUDIO VLC_FOURCC('B','M','V','A')
/* Subtitle */
#define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ')
......
......@@ -210,6 +210,22 @@ static const struct
{ VLC_CODEC_MXPEG, CODEC_ID_MXPEG, VIDEO_ES },
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 19, 0 )
{ VLC_CODEC_VBLE, CODEC_ID_VBLE, VIDEO_ES },
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 1, 0 )
{ VLC_CODEC_CDXL, CODEC_ID_CDXL, VIDEO_ES },
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 13, 0 )
{ VLC_CODEC_UTVIDEO, CODEC_ID_UTVIDEO, VIDEO_ES },
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 28, 0 )
{ VLC_CODEC_DXTORY, CODEC_ID_DXTORY, VIDEO_ES },
#endif
/* Videogames Codecs */
{ VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },
......@@ -243,6 +259,9 @@ static const struct
{ VLC_CODEC_INDEO4, CODEC_ID_INDEO4, VIDEO_ES },
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 17, 0 )
{ VLC_CODEC_BMVVIDEO, CODEC_ID_BMV_VIDEO, VIDEO_ES },
#endif
#if 0
/* UNTESTED VideoGames*/
......@@ -388,6 +407,9 @@ static const struct
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 91, 0 )
{ VLC_CODEC_ADPCM_G722, CODEC_ID_ADPCM_G722, AUDIO_ES },
#endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 53, 17, 0 )
{ VLC_CODEC_BMVAUDIO, CODEC_ID_BMV_AUDIO, AUDIO_ES },
#endif
/* Lossless */
{ VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },
......
......@@ -904,6 +904,24 @@ static const entry_t p_list_video[] = {
B(VLC_CODEC_MXPEG, "Mxpeg"),
A("MXPG"),
B(VLC_CODEC_CDXL, "Commodore CDXL video format"),
A("CDXL"),
B(VLC_CODEC_BMVVIDEO, "Discworld II BMV video"),
A("BMVV"),
B(VLC_CODEC_UTVIDEO, "Ut Video"),
A("ULRA"),
A("ULRG"),
A("ULY0"),
A("ULY2"),
B(VLC_CODEC_VBLE, "VBLE Lossless Codec"),
A("VBLE"),
B(VLC_CODEC_DXTORY, "Dxtory capture format"),
A("xtor"),
B(0, "")
};
static const entry_t p_list_audio[] = {
......@@ -1251,6 +1269,9 @@ static const entry_t p_list_audio[] = {
B(VLC_CODEC_TWINVQ, "TwinVQ"),
A("TWIN"),
B(VLC_CODEC_BMVAUDIO, "Discworld II BMV audio"),
A("BMVA"),
B(0, "")
};
static const entry_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