summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-01-19 00:40:48 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-01-19 00:40:48 +0000
commit586233bf3daa7770550eb47e9aedb7c0c519d5df (patch)
tree8e066647847454dc483a8e181560902bf0cac6ad /libmpdemux
parent7a7d2cdd249a0bae74268f34c464ec0474a39894 (diff)
downloadmpv-586233bf3daa7770550eb47e9aedb7c0c519d5df.tar.bz2
mpv-586233bf3daa7770550eb47e9aedb7c0c519d5df.tar.xz
- added some more
- 10l: MPEG_ES shouldn't be forced, the MPEG_PS demuxer will detect it and switch PS->ES, but ES->PS will never happen! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9009 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/extension.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c
index 467df40f11..3188993b11 100644
--- a/libmpdemux/extension.c
+++ b/libmpdemux/extension.c
@@ -17,7 +17,9 @@ static struct {
} extensions_table[] = {
{ "mpeg", DEMUXER_TYPE_MPEG_PS },
{ "mpg", DEMUXER_TYPE_MPEG_PS },
- { "mpe", DEMUXER_TYPE_MPEG_ES },
+ { "mpe", DEMUXER_TYPE_MPEG_PS },
+ { "vob", DEMUXER_TYPE_MPEG_PS },
+ { "m2v", DEMUXER_TYPE_MPEG_PS },
{ "avi", DEMUXER_TYPE_AVI },
{ "mov", DEMUXER_TYPE_MOV },
{ "qt", DEMUXER_TYPE_MOV },
@@ -26,14 +28,24 @@ static struct {
{ "wmv", DEMUXER_TYPE_ASF },
{ "wma", DEMUXER_TYPE_ASF },
{ "viv", DEMUXER_TYPE_VIVO },
+ { "vivo", DEMUXER_TYPE_VIVO },
{ "rm", DEMUXER_TYPE_REAL },
+ { "rmvb", DEMUXER_TYPE_REAL },
{ "ra", DEMUXER_TYPE_REAL },
{ "y4m", DEMUXER_TYPE_Y4M },
{ "mp3", DEMUXER_TYPE_AUDIO },
- { "ogg", DEMUXER_TYPE_OGG },
{ "wav", DEMUXER_TYPE_AUDIO },
+ { "ogg", DEMUXER_TYPE_OGG },
+ { "ogm", DEMUXER_TYPE_OGG },
{ "pls", DEMUXER_TYPE_PLAYLIST },
- { "m3u", DEMUXER_TYPE_PLAYLIST }
+ { "m3u", DEMUXER_TYPE_PLAYLIST },
+ { "xm", DEMUXER_TYPE_XMMS },
+ { "mod", DEMUXER_TYPE_XMMS },
+ { "s3m", DEMUXER_TYPE_XMMS },
+ { "it", DEMUXER_TYPE_XMMS },
+ { "mid", DEMUXER_TYPE_XMMS },
+ { "midi", DEMUXER_TYPE_XMMS },
+ { "vqf", DEMUXER_TYPE_XMMS }
};
int demuxer_type_by_filename(char* filename){