Merge all but the open()/glibc workaround from 1.1.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index c55ff8726..4f1fc3fb2 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1482,14 +1482,14 @@ static int dvd_plugin_open (input_plugin_t *this_gen) {
   dvd_input_plugin_t    *this = (dvd_input_plugin_t*)this_gen;
   dvd_input_class_t     *class = (dvd_input_class_t*)this_gen->input_class;
   
-  char                  *locator;
+  char                  *locator, *locator_orig;
   char                  *title_part;
   xine_cfg_entry_t       region_entry, lang_entry, cfg_entry;
   
   trace_print("Called\n");
 
   /* we already checked the "dvd:/" MRL before */
-  locator = strdup (this->mrl + (sizeof("dvd:") - 1));
+  locator_orig = locator = strdup (this->mrl + (sizeof("dvd:") - 1));
 
   /* FIXME: call a generic xine-lib MRL parser here to pre-parse
    * the MRL for ?title=<title>&part=<part> stuff and to expand 
@@ -1505,11 +1505,11 @@ static int dvd_plugin_open (input_plugin_t *this_gen) {
     _x_message(this->stream, XINE_MSG_READ_ERROR,
       /* FIXME: see FIXME in dvd_parse_try_open() */
       (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, NULL);
-    free (locator);
+    free (locator_orig);
     return 0;
   }
 
-  free (locator);
+  free (locator_orig);
   
   dvdnav_get_title_string(this->dvdnav, &this->dvd_name);
   if(this->dvd_name)