30 lines
1.4 KiB
Plaintext
30 lines
1.4 KiB
Plaintext
$OpenBSD: patch-src_input_input_dvd_c,v 1.9 2010/01/05 11:48:51 sthen Exp $
|
|
--- src/input/input_dvd.c.orig Mon Nov 30 15:55:45 2009
|
|
+++ src/input/input_dvd.c Wed Dec 2 19:15:35 2009
|
|
@@ -79,7 +79,6 @@
|
|
/* DVDNAV includes */
|
|
#ifdef HAVE_DVDNAV
|
|
# include <dvdnav/dvdnav.h>
|
|
-# include <dvdnav/nav_read.h>
|
|
#else
|
|
# define DVDNAV_COMPILE
|
|
# include "dvdnav.h"
|
|
@@ -608,7 +607,7 @@ static buf_element_t *dvd_plugin_read_block (input_plu
|
|
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
|
|
_("input_dvd: Error getting next block from DVD (%s)\n"), dvdnav_err_to_string(this->dvdnav));
|
|
_x_message(this->stream, XINE_MSG_READ_ERROR,
|
|
- dvdnav_err_to_string(this->dvdnav), NULL);
|
|
+ dvdnav_err_to_string(this->dvdnav), (char *)NULL);
|
|
if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block);
|
|
buf->free_buffer(buf);
|
|
return NULL;
|
|
@@ -1499,7 +1498,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen)
|
|
xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("input_dvd: Error opening DVD device\n"));
|
|
_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);
|
|
+ (strlen(locator) && !(locator[0] == '/' && locator[1] == '\0')) ? locator : class->dvd_device, (char *)NULL);
|
|
free (locator_orig);
|
|
return 0;
|
|
}
|