diff options
| author | Bastien Nocera <hadess@users.sourceforge.net> | 2004-04-05 18:01:09 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@users.sourceforge.net> | 2004-04-05 18:01:09 +0000 |
| commit | 0ce5bafb71d11412b8f1b01af6a09acb0c2fa847 (patch) | |
| tree | 22d3438f5151063d9eeacaf5e871440d3a5023a2 /src/input/libdvdnav | |
| parent | 4b62d4a577a66e5423c6e9c3bbb28336fb29c332 (diff) | |
| download | xine-lib-0ce5bafb71d11412b8f1b01af6a09acb0c2fa847.tar.gz xine-lib-0ce5bafb71d11412b8f1b01af6a09acb0c2fa847.tar.bz2 | |
- allow mounted DVDs to be played back on Linux 2.6, fix a free() on a static string in the VCD plugin
CVS patchset: 6330
CVS date: 2004/04/05 18:01:09
Diffstat (limited to 'src/input/libdvdnav')
| -rw-r--r-- | src/input/libdvdnav/dvd_input.c | 2 | ||||
| -rw-r--r-- | src/input/libdvdnav/vm.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/input/libdvdnav/dvd_input.c b/src/input/libdvdnav/dvd_input.c index 47084016c..1e7775c73 100644 --- a/src/input/libdvdnav/dvd_input.c +++ b/src/input/libdvdnav/dvd_input.c @@ -170,7 +170,7 @@ static dvd_input_t file_open(const char *target) /* Open the device */ #ifndef WIN32 - dev->fd = open(target, O_RDONLY | O_EXCL); + dev->fd = open(target, O_RDONLY); #else dev->fd = open(target, O_RDONLY | O_BINARY); #endif diff --git a/src/input/libdvdnav/vm.c b/src/input/libdvdnav/vm.c index 223b8e85b..1ab8c8e1d 100644 --- a/src/input/libdvdnav/vm.c +++ b/src/input/libdvdnav/vm.c @@ -20,7 +20,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: vm.c,v 1.27 2004/03/16 11:43:38 mroi Exp $ + * $Id: vm.c,v 1.28 2004/04/05 18:01:09 hadess Exp $ * */ @@ -135,7 +135,7 @@ static void dvd_read_name(char *name, const char *device) { uint8_t data[DVD_VIDEO_LB_LEN]; /* Read DVD name */ - fd = open(device, O_RDONLY | O_EXCL); + fd = open(device, O_RDONLY); if (fd > 0) { off = lseek( fd, 32 * (off_t) DVD_VIDEO_LB_LEN, SEEK_SET ); if( off == ( 32 * (off_t) DVD_VIDEO_LB_LEN ) ) { |