summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-14 10:03:42 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-14 10:03:42 +0000
commitef91f5aad83e6f017cbfa37339ae037d9f845800 (patch)
treeee883c495b57a96608590170dd4a62a36841a60f /libmpdemux/demuxer.c
parentd6e892148652175a49f9376228cf677169df85c2 (diff)
downloadmpv-ef91f5aad83e6f017cbfa37339ae037d9f845800.tar.bz2
mpv-ef91f5aad83e6f017cbfa37339ae037d9f845800.tar.xz
Add lavf_preferred demuxer for lavf formats we want to be probed
before our native demuxers and remove some now unneeded file-extension hacks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22989 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 5546d8b09b..b05e990e31 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -64,6 +64,7 @@ extern demuxer_desc_t demuxer_desc_xmms;
extern demuxer_desc_t demuxer_desc_mpeg_ty;
extern demuxer_desc_t demuxer_desc_rtp;
extern demuxer_desc_t demuxer_desc_lavf;
+extern demuxer_desc_t demuxer_desc_lavf_preferred;
extern demuxer_desc_t demuxer_desc_aac;
extern demuxer_desc_t demuxer_desc_nut;
@@ -74,6 +75,7 @@ demuxer_desc_t* demuxer_list[] = {
&demuxer_desc_tv,
#endif
&demuxer_desc_mf,
+ &demuxer_desc_lavf_preferred,
&demuxer_desc_avi,
&demuxer_desc_y4m,
&demuxer_desc_asf,