From: Guillaume Emont Date: Thu, 11 Dec 2008 12:32:03 +0000 (+0000) Subject: gst/typefind/gsttypefindfunctions.c: Add typefinders for MS Word files and OS X ... X-Git-Tag: 1.19.3~511^2~10137 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d477a37e7effb528d8d0f9888fa28c1ab2a4b89f;p=platform%2Fupstream%2Fgstreamer.git gst/typefind/gsttypefindfunctions.c: Add typefinders for MS Word files and OS X .DS_Store files to prevent them to be... Original commit message from CVS: Patch by: Guillaume Emont * gst/typefind/gsttypefindfunctions.c: (plugin_init): Add typefinders for MS Word files and OS X .DS_Store files to prevent them to be recognized as MPEG files. Fixes bug #564098. --- diff --git a/ChangeLog b/ChangeLog index cc3d5af..edaa965 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-11 Sebastian Dröge + + Patch by: Guillaume Emont + + * gst/typefind/gsttypefindfunctions.c: (plugin_init): + Add typefinders for MS Word files and OS X .DS_Store files to + prevent them to be recognized as MPEG files. Fixes bug #564098. + 2008-12-11 Wim Taymans * gst/playback/gstplaysink.c: (gen_audio_chain), diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c index 686937f..8e81fe6 100644 --- a/gst/typefind/gsttypefindfunctions.c +++ b/gst/typefind/gsttypefindfunctions.c @@ -3139,6 +3139,8 @@ plugin_init (GstPlugin * plugin) static gchar *imelody_exts[] = { "imy", "ime", "imelody", NULL }; static gchar *pdf_exts[] = { "pdf", NULL }; static gchar *mxf_exts[] = { "mxf", NULL }; + static gchar *msword_exts[] = { "doc", NULL }; + static gchar *dsstore_exts[] = { "DS_Store", NULL }; GST_DEBUG_CATEGORY_INIT (type_find_debug, "typefindfunctions", GST_DEBUG_FG_GREEN | GST_DEBUG_BG_RED, "generic type find functions"); @@ -3356,6 +3358,13 @@ plugin_init (GstPlugin * plugin) GST_RANK_SECONDARY, nsf_exts, "NESM\x1a", 5, GST_TYPE_FIND_MAXIMUM); TYPE_FIND_REGISTER_START_WITH (plugin, "application/pdf", GST_RANK_SECONDARY, pdf_exts, "%PDF-", 5, GST_TYPE_FIND_LIKELY); + TYPE_FIND_REGISTER_START_WITH (plugin, "application/msword", + GST_RANK_SECONDARY, msword_exts, "\320\317\021\340\241\261\032\341", 8, + GST_TYPE_FIND_LIKELY); + /* Mac OS X .DS_Store files tend to be taken for video/mpeg */ + TYPE_FIND_REGISTER_START_WITH (plugin, "application/octet-stream", + GST_RANK_SECONDARY, dsstore_exts, "\000\000\000\001Bud1", 8, + GST_TYPE_FIND_LIKELY); return TRUE; }