Mercurial > mplayer.hg

changeset 22972:46593cc4aeba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use lavf_preferred mechanism to replace more extension-based detection hacks
author reimar
date Sat, 14 Apr 2007 10:07:36 +0000
parents a1b2fbb000fc
children 46597c69d843
files libmpdemux/demux_lavf.c libmpdemux/extension.c
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Sat Apr 14 10:03:42 2007 +0000
+++ b/libmpdemux/demux_lavf.c	Sat Apr 14 10:07:36 2007 +0000
@@ -218,6 +218,8 @@
     "nut",
     "gxf",
     "mxf",
+    "flv",
+    "swf",
     NULL
 };
 
--- a/libmpdemux/extension.c	Sat Apr 14 10:03:42 2007 +0000
+++ b/libmpdemux/extension.c	Sat Apr 14 10:07:36 2007 +0000
@@ -20,8 +20,6 @@
 //        { "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 @@
 #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 },