summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-08 19:28:28 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-01-08 19:28:28 +0000
commit4af9bf7e02295e001a0a1b16ac77d63d543f1bb6 (patch)
tree3e753df898309c981b4f2f235db346e5caa5ae19 /stream
parent4ae18c932e27a99b1924b3aeb05d806c4f5fda69 (diff)
downloadmpv-4af9bf7e02295e001a0a1b16ac77d63d543f1bb6.tar.bz2
mpv-4af9bf7e02295e001a0a1b16ac77d63d543f1bb6.tar.xz
Switch internal dvdread to libdvdread SVN external.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_dvd.h7
-rw-r--r--stream/stream_dvd_common.c4
-rw-r--r--stream/stream_dvd_common.h4
3 files changed, 0 insertions, 15 deletions
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h
index 9196ef04e0..effd5b3d67 100644
--- a/stream/stream_dvd.h
+++ b/stream/stream_dvd.h
@@ -3,17 +3,10 @@
#include "config.h"
#include <stdint.h>
-#ifdef CONFIG_DVDREAD_INTERNAL
-#include "libdvdread/dvd_reader.h"
-#include "libdvdread/ifo_types.h"
-#include "libdvdread/ifo_read.h"
-#include "libdvdread/nav_read.h"
-#else
#include <dvdread/dvd_reader.h>
#include <dvdread/ifo_types.h>
#include <dvdread/ifo_read.h>
#include <dvdread/nav_read.h>
-#endif
#include "stream.h"
typedef struct {
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c
index e2cf3690ba..55bee132b7 100644
--- a/stream/stream_dvd_common.c
+++ b/stream/stream_dvd_common.c
@@ -1,10 +1,6 @@
#include "config.h"
#include <inttypes.h>
-#ifdef CONFIG_DVDREAD_INTERNAL
-#include "libdvdread/ifo_types.h"
-#else
#include <dvdread/ifo_types.h>
-#endif
#include "stream_dvd_common.h"
/**
diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h
index c79492e061..906ae02ba6 100644
--- a/stream/stream_dvd_common.h
+++ b/stream/stream_dvd_common.h
@@ -3,11 +3,7 @@
#include "config.h"
#include <inttypes.h>
-#ifdef CONFIG_DVDREAD_INTERNAL
-#include "libdvdread/ifo_types.h"
-#else
#include <dvdread/ifo_types.h>
-#endif
int mp_dvdtimetomsec(dvd_time_t *dt);