From 4c305b8cb50685e27513bb66896f24f90993dbae Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 11 Nov 2004 21:05:47 +0000 Subject: [PATCH] gst/typefind/gsttypefindfunctions.c: Prefer apev1/2 and id3v1 (at end of file) over musepack. Original commit message from CVS: * gst/typefind/gsttypefindfunctions.c: (plugin_init): Prefer apev1/2 and id3v1 (at end of file) over musepack. --- ChangeLog | 5 +++++ gst/typefind/gsttypefindfunctions.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c266926154..3d044fcadf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-11-11 Ronald S. Bultje + + * gst/typefind/gsttypefindfunctions.c: (plugin_init): + Prefer apev1/2 and id3v1 (at end of file) over musepack. + 2004-11-11 Ronald S. Bultje * gst/matroska/matroska-demux.c: (gst_matroska_demux_loop_stream): diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c index 44076a3662..c25abc988a 100644 --- a/gst/typefind/gsttypefindfunctions.c +++ b/gst/typefind/gsttypefindfunctions.c @@ -1454,8 +1454,9 @@ plugin_init (GstPlugin * plugin) asf_exts, "\060\046\262\165\216\146\317\021\246\331\000\252\000\142\316\154", 16, GST_TYPE_FIND_MAXIMUM); + /* -1 so id3v1 or apev1/2 are detected with higher preference */ TYPE_FIND_REGISTER_START_WITH (plugin, "audio/x-musepack", GST_RANK_PRIMARY, - musepack_exts, "MP+", 3, GST_TYPE_FIND_MAXIMUM); + musepack_exts, "MP+", 3, GST_TYPE_FIND_MAXIMUM - 1); TYPE_FIND_REGISTER_START_WITH (plugin, "audio/x-au", GST_RANK_MARGINAL, au_exts, ".snd", 4, GST_TYPE_FIND_MAXIMUM); TYPE_FIND_REGISTER_RIFF (plugin, "video/x-msvideo", GST_RANK_PRIMARY,