Make get_description get_identifier get_extensions get_mimetypes return a constant string, and make the extensions and mrl vaiables usually declared when testing extension demux strategy constants too.

CVS patchset: 8523
CVS date: 2007/01/19 00:26:39

1 files changed, 7 insertions, 9 deletions

diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index 98d2136a0..39b887d54 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_matroska.c,v 1.50 2007/01/07 12:33:50 molivier Exp $
+ * $Id: demux_matroska.c,v 1.51 2007/01/19 00:26:40 dgp85 Exp $
  *
  * demultiplexer for matroska streams
  *
@@ -2802,13 +2802,11 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   break;
 
   case METHOD_BY_EXTENSION: {
-    char *mrl = input->get_mrl(input);
-    char *extensions;
+    const char *const mrl = input->get_mrl(input);
+    const char *const extensions = class_gen->get_extensions (class_gen);;
 
     lprintf ("stage by extension %s\n", mrl);
 
-    extensions = class_gen->get_extensions (class_gen);
-
     if (!_x_demux_check_extension (mrl, extensions))
       return NULL;
 
@@ -2866,22 +2864,22 @@ error:
  * demux matroska class
  */
 
-static char *get_description (demux_class_t *this_gen) {
+static const char *get_description (demux_class_t *this_gen) {
   return "matroska demux plugin";
 }
 
 
-static char *get_identifier (demux_class_t *this_gen) {
+static const char *get_identifier (demux_class_t *this_gen) {
   return "matroska";
 }
 
 
-static char *get_extensions (demux_class_t *this_gen) {
+static const char *get_extensions (demux_class_t *this_gen) {
   return "mkv";
 }
 
 
-static char *get_mimetypes (demux_class_t *this_gen) {
+static const char *get_mimetypes (demux_class_t *this_gen) {
   return "video/mkv: mkv: matroska;";
 }