diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-14 10:07:36 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-14 10:07:36 +0000 |
| commit | 720fa4936a0cb04635f1e94369500d903e72de93 (patch) | |
| tree | fa0b2e5da36e28794b957efcdf390e1974e828c0 /libmpdemux | |
| parent | ef91f5aad83e6f017cbfa37339ae037d9f845800 (diff) | |
| download | mpv-720fa4936a0cb04635f1e94369500d903e72de93.tar.bz2 mpv-720fa4936a0cb04635f1e94369500d903e72de93.tar.xz | |
Use lavf_preferred mechanism to replace more extension-based detection hacks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22990 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 2 | ||||
| -rw-r--r-- | libmpdemux/extension.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 943739d323..e30f14247a 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -218,6 +218,8 @@ static const char *preferred_list[] = { "nut", "gxf", "mxf", + "flv", + "swf", NULL }; diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c index 463c21cfc0..3bdd631bce 100644 --- a/libmpdemux/extension.c +++ b/libmpdemux/extension.c @@ -20,8 +20,6 @@ static struct { // { "mpe", DEMUXER_TYPE_MPEG_PS }, { "vob", DEMUXER_TYPE_MPEG_PS }, { "m2v", DEMUXER_TYPE_MPEG_PS }, - { "gxf", DEMUXER_TYPE_LAVF }, - { "mxf", DEMUXER_TYPE_LAVF }, { "avi", DEMUXER_TYPE_AVI }, { "mp4", DEMUXER_TYPE_MOV }, { "mov", DEMUXER_TYPE_MOV }, @@ -57,8 +55,6 @@ static struct { #ifdef USE_WIN32DLL { "avs", DEMUXER_TYPE_AVS }, #endif - { "swf", DEMUXER_TYPE_LAVF }, - { "flv", DEMUXER_TYPE_LAVF }, { "302", DEMUXER_TYPE_LAVF }, { "264", DEMUXER_TYPE_H264_ES }, { "26l", DEMUXER_TYPE_H264_ES }, |