Commit 84daf8ce authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Support for AMV video files.

It seems that .mtv files don't work though
parent 9c45afe2
......@@ -19,7 +19,7 @@ Demuxers:
* Support for ADPCM in .flv streams
* EXPERIMENTAL support for .aob files from DVD-Audio (MLP and LPCM)
(Full disc support is NOT present yet)
* Support for TwinVQ (.vqf) files
* Support for TwinVQ (.vqf) and AMV (.amv) files
* Various EGP improvements
Playlist:
......
......@@ -111,6 +111,7 @@
#define VLC_CODEC_VMDVIDEO VLC_FOURCC('V','M','D','V')
#define VLC_CODEC_CDG VLC_FOURCC('C','D','G',' ')
#define VLC_CODEC_FRWU VLC_FOURCC('F','R','W','U')
#define VLC_CODEC_AMV VLC_FOURCC('A','M','V',' ')
/* Planar YUV 4:2:0 Y:V:U */
......@@ -270,6 +271,7 @@
#define VLC_CODEC_FL32 VLC_FOURCC('f','l','3','2')
#define VLC_CODEC_FL64 VLC_FOURCC('f','l','6','4')
#define VLC_CODEC_TWINVQ VLC_FOURCC('T','W','I','N')
#define VLC_CODEC_ADPCM_IMA_AMV VLC_FOURCC('i','m','a','v')
/* Subtitle */
#define VLC_CODEC_SPU VLC_FOURCC('s','p','u',' ')
......
......@@ -173,7 +173,7 @@ typedef enum vlc_dialog {
"*.oga;*.ogg;*.oma;*.s3m;*.spx;" \
"*.vqf;*.w64;*.wav;*.wma;*.wv;*.xm"
#define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.iso;*.m1v;*.m2v;" \
#define EXTENSIONS_VIDEO "*.amv;*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.iso;*.m1v;*.m2v;" \
"*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp4;*.mpeg;*.mpeg1;" \
"*.mpeg2;*.mpeg4;*.mpg;*.mts;*.mxf;*.nuv;" \
"*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \
......
......@@ -213,6 +213,8 @@ static const struct
{ VLC_CODEC_VMDVIDEO, CODEC_ID_VMDVIDEO, VIDEO_ES },
{ VLC_CODEC_AMV, CODEC_ID_AMV, VIDEO_ES },
#if 0
/* UNTESTED VideoGames*/
{ VLC_FOURCC('W','C','3','V'), CODEC_ID_XAN_WC3,
......@@ -299,6 +301,7 @@ static const struct
{ VLC_CODEC_ADPCM_IMA_WS, CODEC_ID_ADPCM_IMA_WS, AUDIO_ES },
{ VLC_CODEC_ADPCM_MS, CODEC_ID_ADPCM_MS, AUDIO_ES },
{ VLC_CODEC_ADPCM_IMA_WAV, CODEC_ID_ADPCM_IMA_WAV, AUDIO_ES },
{ VLC_CODEC_ADPCM_IMA_AMV, CODEC_ID_ADPCM_IMA_AMV, AUDIO_ES },
{ VLC_CODEC_VMDAUDIO, CODEC_ID_VMDAUDIO, AUDIO_ES },
......
......@@ -591,6 +591,8 @@ static const entry_t p_list_video[] = {
A("AVs2"),
A("avs2"),
B(VLC_CODEC_AMV, "AMV"),
/* */
B(VLC_CODEC_DNXHD, "DNxHD"),
A("AVdn"),
......@@ -920,6 +922,8 @@ static const entry_t p_list_audio[] = {
B(VLC_CODEC_ADPCM_IMA_WAV, "IMA WAV ADPCM Audio"),
A("ms\x00\x11"),
B(VLC_CODEC_ADPCM_IMA_AMV, "IMA AMV ADPCM Audio"),
/* AMR */
B(VLC_CODEC_AMR_NB, "AMR narrow band"),
A("samr"),
......
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