diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-28 01:18:43 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-28 01:18:43 +0000 |
| commit | acfac053906cd3794647c3e99e1770938624d3f8 (patch) | |
| tree | be05c5e1bb7b8bff96d2b1b7cc7b44cde6d09ace /libmpdemux/extension.c | |
| parent | 38ca2416c141d8c163fff8721d8e45f76451a393 (diff) | |
| download | mpv-acfac053906cd3794647c3e99e1770938624d3f8.tar.bz2 mpv-acfac053906cd3794647c3e99e1770938624d3f8.tar.xz | |
- mpeg extensions removed, it causes misdetction of renamed avi/asf files
- .mp4 added
- playlist exts removed, since DEMUX_TYPE_PLAYLIST is dummy, it will never
return demuxer!=NULL
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9135 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/extension.c')
| -rw-r--r-- | libmpdemux/extension.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c index 9c1e6bd002..93ccbc1e4b 100644 --- a/libmpdemux/extension.c +++ b/libmpdemux/extension.c @@ -15,12 +15,13 @@ static struct { char *extension; int demuxer_type; } extensions_table[] = { - { "mpeg", DEMUXER_TYPE_MPEG_PS }, - { "mpg", DEMUXER_TYPE_MPEG_PS }, - { "mpe", DEMUXER_TYPE_MPEG_PS }, +// { "mpeg", DEMUXER_TYPE_MPEG_PS }, +// { "mpg", DEMUXER_TYPE_MPEG_PS }, +// { "mpe", DEMUXER_TYPE_MPEG_PS }, { "vob", DEMUXER_TYPE_MPEG_PS }, { "m2v", DEMUXER_TYPE_MPEG_PS }, { "avi", DEMUXER_TYPE_AVI }, + { "mp4", DEMUXER_TYPE_MOV }, { "mov", DEMUXER_TYPE_MOV }, { "qt", DEMUXER_TYPE_MOV }, { "asx", DEMUXER_TYPE_ASF }, @@ -37,8 +38,8 @@ static struct { { "wav", DEMUXER_TYPE_AUDIO }, { "ogg", DEMUXER_TYPE_OGG }, { "ogm", DEMUXER_TYPE_OGG }, - { "pls", DEMUXER_TYPE_PLAYLIST }, - { "m3u", DEMUXER_TYPE_PLAYLIST }, +// { "pls", DEMUXER_TYPE_PLAYLIST }, +// { "m3u", DEMUXER_TYPE_PLAYLIST }, { "xm", DEMUXER_TYPE_XMMS }, { "mod", DEMUXER_TYPE_XMMS }, { "s3m", DEMUXER_TYPE_XMMS }, |