diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-09-09 23:59:48 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-09-09 23:59:48 +0100 |
| commit | adbc58dcc507fbca0acaa9aa7251965264cadf87 (patch) | |
| tree | 2078239f0fe336f7451b65b04522063b3c169c37 /src/input | |
| parent | f66e7c14140725b6abc044498fd399a7e40e86e1 (diff) | |
| parent | 3689e8c96b7442293ab3365d9dd085135a9d7c6c (diff) | |
| download | xine-lib-adbc58dcc507fbca0acaa9aa7251965264cadf87.tar.gz xine-lib-adbc58dcc507fbca0acaa9aa7251965264cadf87.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/input_dvd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 4f1fc3fb2..83ec751a4 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -1509,8 +1509,6 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { return 0; } - free (locator_orig); - dvdnav_get_title_string(this->dvdnav, &this->dvd_name); if(this->dvd_name) _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, this->dvd_name); @@ -1558,6 +1556,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { "input_dvd: Title %i is out of range (1 to %i).\n", tt, titles); dvdnav_close(this->dvdnav); this->dvdnav = NULL; + free (locator_orig); return 0; } @@ -1571,6 +1570,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { "input_dvd: Part %i is out of range (1 to %i).\n", pr, parts); dvdnav_close(this->dvdnav); this->dvdnav = NULL; + free (locator_orig); return 0; } } @@ -1605,7 +1605,8 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { } update_title_display(this); - + + free (locator_orig); return 1; } |