Merge svn changes up to r30136

Ignore another broken correct-pts change in 30134.

1 files changed, 7 insertions, 4 deletions

diff --git a/libmpdemux/extension.c b/libmpdemux/extension.c
index 59d242e4dd..1d2ffb832e 100644
--- a/libmpdemux/extension.c
+++ b/libmpdemux/extension.c
@@ -27,6 +27,12 @@
 
 /*
  * An autodetection based on the extension is not a good idea, but we don't care ;-)
+ *
+ * You should not add anything here where autodetection can be easily fixed except in
+ * order to speed up auto-detection, in particular for formats that are often streamed.
+ * In particular you should not normally add any DEMUXER_TYPE_LAVF, adding the
+ * format to preferred_list in libmpdemux/demuxer_lavf.c will usually achieve
+ * the same effect in a much more reliable way.
  */
 static struct {
         const char *extension;
@@ -38,9 +44,6 @@ static struct {
         { "vob", DEMUXER_TYPE_MPEG_PS },
         { "m2v", DEMUXER_TYPE_MPEG_PS },
         { "avi", DEMUXER_TYPE_AVI },
-        { "mp4", DEMUXER_TYPE_LAVF },
-        { "mov", DEMUXER_TYPE_LAVF },
-        { "qt", DEMUXER_TYPE_LAVF },
         { "asx", DEMUXER_TYPE_ASF },
         { "asf", DEMUXER_TYPE_ASF },
         { "wmv", DEMUXER_TYPE_ASF },
@@ -65,7 +68,6 @@ static struct {
         { "it", DEMUXER_TYPE_XMMS },
         { "mid", DEMUXER_TYPE_XMMS },
         { "midi", DEMUXER_TYPE_XMMS },
-        { "vqf", DEMUXER_TYPE_LAVF },
         { "nsv", DEMUXER_TYPE_NSV },
         { "nsa", DEMUXER_TYPE_NSV },
         { "mpc", DEMUXER_TYPE_MPC },
@@ -81,6 +83,7 @@ static struct {
         { "eac3",DEMUXER_TYPE_LAVF },
         { "mac", DEMUXER_TYPE_LAVF },
         { "str", DEMUXER_TYPE_LAVF },
+        { "cdg", DEMUXER_TYPE_LAVF },
 
 // At least the following are hacks against broken autodetection
 // that should not be there