Mercurial > mplayer.hg
annotate libdvdread/libdvdread_changes.diff @ 20826:bad45d01be6a
Remove loader_objfix.sh hack, it's only needed for very old OpenBSD versions.
author | diego |
---|---|
date | Fri, 10 Nov 2006 18:28:53 +0000 |
parents | 8b9a98c1f351 |
children |
rev | line source |
---|---|
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
1 diff -Naur dvdread.orig/bswap.h dvdread/bswap.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
2 --- dvdread.orig/bswap.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
3 +++ dvdread/bswap.h 2005-06-23 00:19:10.000000000 +0200 |
20793 | 4 @@ -59,13 +63,57 @@ |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
5 #define B2N_32(x) x = be32toh(x) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
6 #define B2N_64(x) x = be64toh(x) |
14937 | 7 |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
8 +#elif defined(__DragonFly__) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
9 +#include <sys/endian.h> |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
10 +#define B2N_16(x) x = be16toh(x) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
11 +#define B2N_32(x) x = be32toh(x) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
12 +#define B2N_64(x) x = be64toh(x) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
13 + |
14937 | 14 +#elif defined(ARCH_X86) |
15 +inline static unsigned short bswap_16(unsigned short x) | |
16 +{ | |
17 + __asm("xchgb %b0,%h0" : | |
18 + "=q" (x) : | |
19 + "0" (x)); | |
20 + return x; | |
21 +} | |
22 +#define B2N_16(x) x = bswap_16(x) | |
23 + | |
24 +inline static unsigned int bswap_32(unsigned int x) | |
25 +{ | |
26 + __asm( | |
27 +#if __CPU__ > 386 | |
28 + "bswap %0": | |
29 + "=r" (x) : | |
30 +#else | |
31 + "xchgb %b0,%h0\n" | |
32 + " rorl $16,%0\n" | |
33 + " xchgb %b0,%h0": | |
34 + "=q" (x) : | |
35 +#endif | |
36 + "0" (x)); | |
37 + return x; | |
38 +} | |
39 +#define B2N_32(x) x = bswap_32(x) | |
40 + | |
41 +inline static unsigned long long int bswap_64(unsigned long long int x) | |
42 +{ | |
43 + register union { __extension__ uint64_t __ll; | |
44 + uint32_t __l[2]; } __x; | |
45 + asm("xchgl %0,%1": | |
46 + "=r"(__x.__l[0]),"=r"(__x.__l[1]): | |
47 + "0"(bswap_32((unsigned long)x)),"1"(bswap_32((unsigned long)(x>>32)))); | |
48 + return __x.__ll; | |
49 +} | |
50 +#define B2N_64(x) x = bswap_64(x) | |
51 + | |
52 /* This is a slow but portable implementation, it has multiple evaluation | |
53 * problems so beware. | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
54 * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such |
14937 | 55 * functionality! |
56 */ | |
57 | |
58 -#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) | |
59 +#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(__CYGWIN__) | |
60 #define B2N_16(x) \ | |
61 x = ((((x) & 0xff00) >> 8) | \ | |
62 (((x) & 0x00ff) << 8)) | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
63 diff -Naur dvdread.orig/.cvsignore dvdread/.cvsignore |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
64 diff -Naur dvdread.orig/dvd_input.c dvdread/dvd_input.c |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
65 --- dvdread.orig/dvd_input.c 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
66 +++ dvdread/dvd_input.c 2005-06-23 00:30:23.000000000 +0200 |
18371 | 67 @@ -37,7 +41,7 @@ |
14937 | 68 |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
69 #ifdef HAVE_DVDCSS_DVDCSS_H |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
70 /* linking to libdvdcss */ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
71 -#include <dvdcss/dvdcss.h> |
19820
e5d97c5f3c32
Move dvdcss.h to a dvdcss subdirectory, just like upstream libdvdcss does.
diego
parents:
18910
diff
changeset
|
72 +#include "dvdcss/dvdcss.h" |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
73 #define DVDcss_open(a) dvdcss_open((char*)(a)) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
74 #define DVDcss_close dvdcss_close |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
75 #define DVDcss_seek dvdcss_seek |
18371 | 76 @@ -74,7 +78,7 @@ |
14937 | 77 dvd_input_t dev; |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
78 |
14937 | 79 /* Allocate the handle structure */ |
80 - dev = (dvd_input_t) malloc(sizeof(dvd_input_t)); | |
81 + dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s)); | |
82 if(dev == NULL) { | |
83 fprintf(stderr, "libdvdread: Could not allocate memory.\n"); | |
84 return NULL; | |
18371 | 85 @@ -154,7 +158,7 @@ |
17786
f0f54034c7e9
fix another sizeof(dvd_input_t) bug (must be struct dvd_input_s instead)
reimar
parents:
17313
diff
changeset
|
86 dvd_input_t dev; |
f0f54034c7e9
fix another sizeof(dvd_input_t) bug (must be struct dvd_input_s instead)
reimar
parents:
17313
diff
changeset
|
87 |
f0f54034c7e9
fix another sizeof(dvd_input_t) bug (must be struct dvd_input_s instead)
reimar
parents:
17313
diff
changeset
|
88 /* Allocate the library structure */ |
f0f54034c7e9
fix another sizeof(dvd_input_t) bug (must be struct dvd_input_s instead)
reimar
parents:
17313
diff
changeset
|
89 - dev = (dvd_input_t) malloc(sizeof(dvd_input_t)); |
f0f54034c7e9
fix another sizeof(dvd_input_t) bug (must be struct dvd_input_s instead)
reimar
parents:
17313
diff
changeset
|
90 + dev = (dvd_input_t) malloc(sizeof(struct dvd_input_s)); |
f0f54034c7e9
fix another sizeof(dvd_input_t) bug (must be struct dvd_input_s instead)
reimar
parents:
17313
diff
changeset
|
91 if(dev == NULL) { |
f0f54034c7e9
fix another sizeof(dvd_input_t) bug (must be struct dvd_input_s instead)
reimar
parents:
17313
diff
changeset
|
92 fprintf(stderr, "libdvdread: Could not allocate memory.\n"); |
f0f54034c7e9
fix another sizeof(dvd_input_t) bug (must be struct dvd_input_s instead)
reimar
parents:
17313
diff
changeset
|
93 return NULL; |
18371 | 94 @@ -320,8 +324,10 @@ |
14937 | 95 fprintf(stderr, "DVDCSS_METHOD %s\n", psz_method); |
96 fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose); | |
97 */ | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
98 + /* |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
99 fprintf(stderr, "libdvdread: Using libdvdcss version %s for DVD access\n", |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
100 *dvdcss_version); |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
101 + */ |
14937 | 102 |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
103 /* libdvdcss wrapper functions */ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
104 dvdinput_open = css_open; |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
105 diff -Naur dvdread.orig/dvd_input.h dvdread/dvd_input.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
106 diff -Naur dvdread.orig/dvd_reader.c dvdread/dvd_reader.c |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
107 --- dvdread.orig/dvd_reader.c 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
108 +++ dvdread/dvd_reader.c 2005-06-23 00:19:10.000000000 +0200 |
18371 | 109 @@ -32,24 +36,36 @@ |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
110 #include <limits.h> |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
111 #include <dirent.h> |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
112 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
113 -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) |
17311 | 114 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DARWIN__) || defined(__DragonFly__) |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
115 #define SYS_BSD 1 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
116 #endif |
14937 | 117 |
118 #if defined(__sun) | |
119 #include <sys/mnttab.h> | |
120 +#elif defined(hpux) | |
121 +#include </usr/conf/h/mnttab.h> | |
122 #elif defined(SYS_BSD) | |
123 #include <fstab.h> | |
15535 | 124 -#elif defined(__linux__) |
125 +#elif defined(__linux__) || defined(__CYGWIN__) | |
14937 | 126 #include <mntent.h> |
127 #endif | |
128 | |
18910 | 129 +#if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION <= 3) && (__MINGW32_MINOR_VERSION < 10) |
14937 | 130 +#include <sys/timeb.h> |
131 +static void gettimeofday(struct timeval* t,void* timezone){ | |
132 + struct timeb timebuffer; | |
133 + ftime( &timebuffer ); | |
134 + t->tv_sec=timebuffer.time; | |
135 + t->tv_usec=1000*timebuffer.millitm; | |
136 +} | |
137 +#endif | |
138 + | |
139 #include "dvd_udf.h" | |
140 #include "dvd_input.h" | |
141 #include "dvd_reader.h" | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
142 #include "md5.h" |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
143 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
144 -#define DEFAULT_UDF_CACHE_LEVEL 1 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
145 +#define DEFAULT_UDF_CACHE_LEVEL 0 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
146 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
147 struct dvd_reader_s { |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
148 /* Basic information. */ |
18371 | 149 @@ -278,11 +301,16 @@ |
16510 | 150 Darwin /dev/rdisk0, it needs to be the raw device |
151 BSD/OS /dev/sr0c (if not mounted) or /dev/rsr0c ('c' any letter will do) */ | |
152 static char *bsd_block2char( const char *path ) | |
153 +#if defined(__FreeBSD__) | |
154 +{ | |
155 + return (char *) strdup( path ); | |
156 +} | |
157 +#else | |
158 { | |
14937 | 159 char *new_path; |
160 | |
161 /* If it doesn't start with "/dev/" or does start with "/dev/r" exit */ | |
162 - if( !strncmp( path, "/dev/", 5 ) || strncmp( path, "/dev/r", 6 ) ) | |
163 + if( strncmp( path, "/dev/", 5 ) || !strncmp( path, "/dev/r", 6 ) ) | |
164 return (char *) strdup( path ); | |
165 | |
166 /* Replace "/dev/" with "/dev/r" */ | |
18371 | 167 @@ -292,6 +320,7 @@ |
16510 | 168 |
169 return new_path; | |
170 } | |
171 +#endif /* __FreeBSD__ */ | |
172 #endif | |
173 | |
174 dvd_reader_t *DVDOpen( const char *path ) | |
18371 | 175 @@ -303,6 +332,16 @@ |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
176 if( path == NULL ) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
177 return 0; |
14937 | 178 |
179 +#ifdef WIN32 | |
180 + /* Stat doesn't work on devices under mingwin/cygwin. */ | |
181 + if( path[0] && path[1] == ':' && path[2] == '\0' ) | |
182 + { | |
183 + /* Don't try to stat the file */ | |
184 + fileinfo.st_mode = S_IFBLK; | |
185 + } | |
186 + else | |
187 +#endif | |
188 + { | |
189 ret = stat( path, &fileinfo ); | |
190 if( ret < 0 ) { | |
191 /* If we can't stat the file, give up */ | |
18371 | 192 @@ -310,6 +349,7 @@ |
14937 | 193 perror(""); |
194 return 0; | |
195 } | |
196 + } | |
197 | |
198 /* Try to open libdvdcss or fall back to standard functions */ | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
199 have_css = dvdinput_setup(); |
18371 | 200 @@ -335,7 +375,7 @@ |
15535 | 201 char *path_copy; |
202 #if defined(SYS_BSD) | |
203 struct fstab* fe; | |
204 -#elif defined(__sun) || defined(__linux__) | |
205 +#elif defined(__sun) || defined(__linux__) || defined(__CYGWIN__) | |
206 FILE *mntfile; | |
207 #endif | |
208 | |
18371 | 209 @@ -350,7 +390,9 @@ |
14937 | 210 if( cdir >= 0 ) { |
211 chdir( path_copy ); | |
212 new_path = getcwd( NULL, PATH_MAX ); | |
213 +#ifndef __MINGW32__ | |
214 fchdir( cdir ); | |
215 +#endif | |
216 close( cdir ); | |
217 if( new_path ) { | |
218 free( path_copy ); | |
18371 | 219 @@ -406,7 +448,7 @@ |
15535 | 220 } |
221 fclose( mntfile ); | |
222 } | |
223 -#elif defined(__linux__) | |
224 +#elif defined(__linux__) || defined(__CYGWIN__) | |
225 mntfile = fopen( MOUNTED, "r" ); | |
226 if( mntfile ) { | |
227 struct mntent *me; | |
18371 | 228 @@ -425,6 +467,9 @@ |
14937 | 229 } |
230 fclose( mntfile ); | |
231 } | |
15535 | 232 +#elif defined(__MINGW32__) |
14937 | 233 + dev_name = strdup(path); |
234 + auth_drive = DVDOpenImageFile( path, have_css ); | |
235 #endif | |
236 if( !dev_name ) { | |
237 fprintf( stderr, "libdvdread: Couldn't find device name.\n" ); | |
18371 | 238 @@ -615,8 +660,8 @@ |
14937 | 239 } |
240 | |
241 if( dvd->css_state == 1 /* Need key init */ ) { | |
242 - initAllCSSKeys( dvd ); | |
243 - dvd->css_state = 2; | |
244 +// initAllCSSKeys( dvd ); | |
245 +// dvd->css_state = 2; | |
246 } | |
247 /* | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
248 if( dvdinput_title( dvd_file->dvd->dev, (int)start ) < 0 ) { |
18371 | 249 @@ -915,7 +960,7 @@ |
14937 | 250 return (ssize_t)ret; |
251 } | |
252 | |
253 -int32_t DVDFileSeek( dvd_file_t *dvd_file, int32_t offset ) | |
254 +int DVDFileSeek( dvd_file_t *dvd_file, int offset ) | |
255 { | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
256 /* Check arguments. */ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
257 if( dvd_file == NULL || offset < 0 ) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
258 diff -Naur dvdread.orig/dvdread_internal.h dvdread/dvdread_internal.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
259 --- dvdread.orig/dvdread_internal.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
260 +++ dvdread/dvdread_internal.h 2005-06-23 00:19:10.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
261 @@ -2,11 +2,7 @@ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
262 #define DVDREAD_INTERNAL_H |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
263 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
264 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
265 -#define CHECK_VALUE(arg) \ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
266 - if(!(arg)) { \ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
267 - fprintf(stderr, "\n*** libdvdread: CHECK_VALUE failed in %s:%i ***" \ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
268 - "\n*** for %s ***\n\n", \ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
269 - __FILE__, __LINE__, # arg ); \ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
270 - } |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
271 +#define CHECK_VALUE(arg) |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
272 + |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
273 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
274 #endif /* DVDREAD_INTERNAL_H */ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
275 diff -Naur dvdread.orig/dvd_udf.c dvdread/dvd_udf.c |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
276 --- dvdread.orig/dvd_udf.c 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
277 +++ dvdread/dvd_udf.c 2005-06-23 00:19:10.000000000 +0200 |
18371 | 278 @@ -33,7 +37,9 @@ |
14937 | 279 #include <stdio.h> |
280 #include <stdlib.h> | |
281 #include <string.h> | |
282 +#ifndef __MINGW32__ | |
283 #include <sys/ioctl.h> | |
284 +#endif | |
285 #include <sys/types.h> | |
286 #include <sys/stat.h> | |
287 #include <unistd.h> | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
288 diff -Naur dvdread.orig/ifo_print.c dvdread/ifo_print.c |
16659 | 289 --- dvdread.orig/ifo_print.c 30 Jun 2005 22:48:26 -0000 1.4 |
290 +++ dvdread/ifo_print.c 3 Oct 2005 14:29:01 -0000 1.5 | |
291 @@ -761,14 +761,14 @@ | |
292 ifoPrint_USER_OPS(&pgc->prohibited_ops); | |
293 | |
294 for(i = 0; i < 8; i++) { | |
295 - if(pgc->audio_control[i] & 0x8000) { /* The 'is present' bit */ | |
296 + if(pgc->audio_control[i].present) { | |
297 printf("Audio stream %i control: %04x\n", | |
298 i, pgc->audio_control[i]); | |
299 } | |
300 } | |
301 | |
302 for(i = 0; i < 32; i++) { | |
303 - if(pgc->subp_control[i] & 0x80000000) { /* The 'is present' bit */ | |
304 + if(pgc->subp_control[i].present) { | |
305 printf("Subpicture stream %2i control: %08x\n", | |
306 i, pgc->subp_control[i]); | |
307 } | |
308 | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
309 diff -Naur dvdread.orig/ifo_print.h dvdread/ifo_print.h |
20615
1a4fcea7ab53
libmpdvdkit2 --> libdvdread, it just contains libdvdread now.
diego
parents:
19820
diff
changeset
|
310 --- dvdread.orig/ifo_print.h 2002-08-15 22:13:21.000000000 +0200 |
1a4fcea7ab53
libmpdvdkit2 --> libdvdread, it just contains libdvdread now.
diego
parents:
19820
diff
changeset
|
311 +++ dvdread/ifo_print.h 2005-12-29 13:13:21.000000000 +0100 |
18371 | 312 @@ -20,8 +24,8 @@ |
17311 | 313 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
314 */ | |
315 | |
316 -#include <dvdread/ifo_types.h> | |
317 -#include <dvdread/dvd_reader.h> | |
318 +#include "ifo_types.h" | |
319 +#include "dvd_reader.h" | |
320 | |
321 #ifdef __cplusplus | |
322 extern "C" { | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
323 diff -Naur dvdread.orig/ifo_read.c dvdread/ifo_read.c |
16659 | 324 --- dvdread.orig/ifo_read.c 30 Jun 2005 22:48:26 -0000 1.4 |
325 +++ dvdread/ifo_read.c 3 Oct 2005 14:29:01 -0000 1.5 | |
20790 | 326 @@ -97,7 +101,7 @@ |
327 ifo_handle_t *ifoOpen(dvd_reader_t *dvd, int title) { | |
328 ifo_handle_t *ifofile; | |
329 | |
330 - ifofile = (ifo_handle_t *)malloc(sizeof(ifo_handle_t)); | |
331 + ifofile = malloc(sizeof(ifo_handle_t)); | |
332 if(!ifofile) | |
333 return 0; | |
334 | |
335 @@ -182,7 +186,7 @@ | |
336 ifo_handle_t *ifoOpenVMGI(dvd_reader_t *dvd) { | |
337 ifo_handle_t *ifofile; | |
338 | |
339 - ifofile = (ifo_handle_t *)malloc(sizeof(ifo_handle_t)); | |
340 + ifofile = malloc(sizeof(ifo_handle_t)); | |
341 if(!ifofile) | |
342 return 0; | |
343 | |
344 @@ -209,7 +213,7 @@ | |
345 ifo_handle_t *ifoOpenVTSI(dvd_reader_t *dvd, int title) { | |
346 ifo_handle_t *ifofile; | |
347 | |
348 - ifofile = (ifo_handle_t *)malloc(sizeof(ifo_handle_t)); | |
349 + ifofile = malloc(sizeof(ifo_handle_t)); | |
350 if(!ifofile) | |
351 return 0; | |
352 | |
353 @@ -274,7 +278,7 @@ | |
354 static int ifoRead_VMG(ifo_handle_t *ifofile) { | |
355 vmgi_mat_t *vmgi_mat; | |
356 | |
357 - vmgi_mat = (vmgi_mat_t *)malloc(sizeof(vmgi_mat_t)); | |
358 + vmgi_mat = malloc(sizeof(vmgi_mat_t)); | |
359 if(!vmgi_mat) | |
360 return 0; | |
361 | |
362 @@ -365,7 +369,7 @@ | |
363 vtsi_mat_t *vtsi_mat; | |
364 int i; | |
365 | |
366 - vtsi_mat = (vtsi_mat_t *)malloc(sizeof(vtsi_mat_t)); | |
367 + vtsi_mat = malloc(sizeof(vtsi_mat_t)); | |
368 if(!vtsi_mat) | |
369 return 0; | |
370 | |
371 @@ -493,7 +497,7 @@ | |
372 | |
373 if(cmd_tbl->nr_of_pre != 0) { | |
374 unsigned int pre_cmds_size = cmd_tbl->nr_of_pre * COMMAND_DATA_SIZE; | |
375 - cmd_tbl->pre_cmds = (vm_cmd_t *)malloc(pre_cmds_size); | |
376 + cmd_tbl->pre_cmds = malloc(pre_cmds_size); | |
377 if(!cmd_tbl->pre_cmds) | |
378 return 0; | |
379 | |
380 @@ -505,7 +509,7 @@ | |
381 | |
382 if(cmd_tbl->nr_of_post != 0) { | |
383 unsigned int post_cmds_size = cmd_tbl->nr_of_post * COMMAND_DATA_SIZE; | |
384 - cmd_tbl->post_cmds = (vm_cmd_t *)malloc(post_cmds_size); | |
385 + cmd_tbl->post_cmds = malloc(post_cmds_size); | |
386 if(!cmd_tbl->post_cmds) { | |
387 if(cmd_tbl->pre_cmds) | |
388 free(cmd_tbl->pre_cmds); | |
389 @@ -521,7 +525,7 @@ | |
390 | |
391 if(cmd_tbl->nr_of_cell != 0) { | |
392 unsigned int cell_cmds_size = cmd_tbl->nr_of_cell * COMMAND_DATA_SIZE; | |
393 - cmd_tbl->cell_cmds = (vm_cmd_t *)malloc(cell_cmds_size); | |
394 + cmd_tbl->cell_cmds = malloc(cell_cmds_size); | |
395 if(!cmd_tbl->cell_cmds) { | |
396 if(cmd_tbl->pre_cmds) | |
397 free(cmd_tbl->pre_cmds); | |
398 @@ -638,10 +642,6 @@ | |
16659 | 399 B2N_16(pgc->cell_playback_offset); |
400 B2N_16(pgc->cell_position_offset); | |
401 | |
402 - for(i = 0; i < 8; i++) | |
403 - B2N_16(pgc->audio_control[i]); | |
404 - for(i = 0; i < 32; i++) | |
405 - B2N_32(pgc->subp_control[i]); | |
406 for(i = 0; i < 16; i++) | |
407 B2N_32(pgc->palette[i]); | |
408 | |
20790 | 409 @@ -650,10 +650,10 @@ |
16659 | 410 |
411 /* verify time (look at print_time) */ | |
412 for(i = 0; i < 8; i++) | |
413 - if(!pgc->audio_control[i] & 0x8000) /* The 'is present' bit */ | |
414 + if(!pgc->audio_control[i].present) | |
415 CHECK_ZERO(pgc->audio_control[i]); | |
416 for(i = 0; i < 32; i++) | |
417 - if(!pgc->subp_control[i] & 0x80000000) /* The 'is present' bit */ | |
418 + if(!pgc->subp_control[i].present) | |
419 CHECK_ZERO(pgc->subp_control[i]); | |
420 | |
421 /* Check that time is 0:0:0:0 also if nr_of_programs == 0 */ | |
20790 | 422 @@ -752,7 +752,7 @@ |
423 if(ifofile->vmgi_mat->first_play_pgc == 0) | |
424 return 1; | |
425 | |
426 - ifofile->first_play_pgc = (pgc_t *)malloc(sizeof(pgc_t)); | |
427 + ifofile->first_play_pgc = malloc(sizeof(pgc_t)); | |
428 if(!ifofile->first_play_pgc) | |
429 return 0; | |
430 | |
431 @@ -806,7 +806,7 @@ | |
432 if(!DVDFileSeek_(ifofile->file, ifofile->vmgi_mat->tt_srpt * DVD_BLOCK_LEN)) | |
433 return 0; | |
434 | |
435 - tt_srpt = (tt_srpt_t *)malloc(sizeof(tt_srpt_t)); | |
436 + tt_srpt = malloc(sizeof(tt_srpt_t)); | |
437 if(!tt_srpt) | |
438 return 0; | |
439 | |
440 @@ -823,7 +823,7 @@ | |
441 | |
442 info_length = tt_srpt->last_byte + 1 - TT_SRPT_SIZE; | |
443 | |
444 - tt_srpt->title = (title_info_t *)malloc(info_length); | |
445 + tt_srpt->title = malloc(info_length); | |
446 if(!tt_srpt->title) { | |
447 free(tt_srpt); | |
448 ifofile->tt_srpt = 0; | |
449 @@ -908,7 +908,7 @@ | |
450 ifofile->vtsi_mat->vts_ptt_srpt * DVD_BLOCK_LEN)) | |
451 return 0; | |
452 | |
453 - vts_ptt_srpt = (vts_ptt_srpt_t *)malloc(sizeof(vts_ptt_srpt_t)); | |
454 + vts_ptt_srpt = malloc(sizeof(vts_ptt_srpt_t)); | |
455 if(!vts_ptt_srpt) | |
456 return 0; | |
457 | |
458 @@ -929,7 +929,7 @@ | |
459 | |
460 info_length = vts_ptt_srpt->last_byte + 1 - VTS_PTT_SRPT_SIZE; | |
461 | |
462 - data = (uint32_t *)malloc(info_length); | |
463 + data = malloc(info_length); | |
464 if(!data) { | |
465 free(vts_ptt_srpt); | |
466 ifofile->vts_ptt_srpt = 0; | |
467 @@ -1047,7 +1047,7 @@ | |
468 if(!DVDFileSeek_(ifofile->file, ifofile->vmgi_mat->ptl_mait * DVD_BLOCK_LEN)) | |
469 return 0; | |
470 | |
471 - ptl_mait = (ptl_mait_t *)malloc(sizeof(ptl_mait_t)); | |
472 + ptl_mait = malloc(sizeof(ptl_mait_t)); | |
473 if(!ptl_mait) | |
474 return 0; | |
475 | |
476 @@ -1071,7 +1071,7 @@ | |
477 <= ptl_mait->last_byte + 1 - PTL_MAIT_SIZE); | |
478 | |
479 info_length = ptl_mait->nr_of_countries * sizeof(ptl_mait_country_t); | |
480 - ptl_mait->countries = (ptl_mait_country_t *)malloc(info_length); | |
481 + ptl_mait->countries = malloc(info_length); | |
482 if(!ptl_mait->countries) { | |
483 free(ptl_mait); | |
484 ifofile->ptl_mait = 0; | |
485 @@ -1112,7 +1112,7 @@ | |
486 return 0; | |
487 } | |
488 info_length = (ptl_mait->nr_of_vtss + 1) * sizeof(pf_level_t); | |
489 - pf_temp = (uint16_t *)malloc(info_length); | |
490 + pf_temp = malloc(info_length); | |
491 if(!pf_temp) { | |
492 for(j = 0; j < i ; j++) { | |
493 free(ptl_mait->countries[j].pf_ptl_mai); | |
494 @@ -1134,7 +1134,7 @@ | |
495 for (j = 0; j < ((ptl_mait->nr_of_vtss + 1) * 8); j++) { | |
496 B2N_16(pf_temp[j]); | |
497 } | |
498 - ptl_mait->countries[i].pf_ptl_mai = (pf_level_t *)malloc(info_length); | |
499 + ptl_mait->countries[i].pf_ptl_mai = malloc(info_length); | |
500 if(!ptl_mait->countries[i].pf_ptl_mai) { | |
501 free(pf_temp); | |
502 for(j = 0; j < i ; j++) { | |
503 @@ -1198,7 +1198,7 @@ | |
504 if(!DVDFileSeek_(ifofile->file, offset)) | |
505 return 0; | |
506 | |
507 - vts_tmapt = (vts_tmapt_t *)malloc(sizeof(vts_tmapt_t)); | |
508 + vts_tmapt = malloc(sizeof(vts_tmapt_t)); | |
509 if(!vts_tmapt) | |
510 return 0; | |
511 | |
512 @@ -1218,7 +1218,7 @@ | |
513 | |
514 info_length = vts_tmapt->nr_of_tmaps * 4; | |
515 | |
516 - vts_tmap_srp = (uint32_t *)malloc(info_length); | |
517 + vts_tmap_srp = malloc(info_length); | |
518 if(!vts_tmap_srp) { | |
519 free(vts_tmapt); | |
520 ifofile->vts_tmapt = NULL; | |
521 @@ -1242,7 +1242,7 @@ | |
522 | |
523 info_length = vts_tmapt->nr_of_tmaps * sizeof(vts_tmap_t); | |
524 | |
525 - vts_tmapt->tmap = (vts_tmap_t *)malloc(info_length); | |
526 + vts_tmapt->tmap = malloc(info_length); | |
527 if(!vts_tmapt->tmap) { | |
528 free(vts_tmap_srp); | |
529 free(vts_tmapt); | |
530 @@ -1274,7 +1274,7 @@ | |
531 | |
532 info_length = vts_tmapt->tmap[i].nr_of_entries * sizeof(map_ent_t); | |
533 | |
534 - vts_tmapt->tmap[i].map_ent = (map_ent_t *)malloc(info_length); | |
535 + vts_tmapt->tmap[i].map_ent = malloc(info_length); | |
536 if(!vts_tmapt->tmap[i].map_ent) { | |
537 ifoFree_VTS_TMAPT(ifofile); | |
538 return 0; | |
539 @@ -1322,7 +1322,7 @@ | |
540 if(ifofile->vtsi_mat->vts_c_adt == 0) /* mandatory */ | |
541 return 0; | |
542 | |
543 - ifofile->vts_c_adt = (c_adt_t *)malloc(sizeof(c_adt_t)); | |
544 + ifofile->vts_c_adt = malloc(sizeof(c_adt_t)); | |
545 if(!ifofile->vts_c_adt) | |
546 return 0; | |
547 | |
548 @@ -1354,7 +1354,7 @@ | |
549 return 0; | |
550 } | |
551 | |
552 - ifofile->menu_c_adt = (c_adt_t *)malloc(sizeof(c_adt_t)); | |
553 + ifofile->menu_c_adt = malloc(sizeof(c_adt_t)); | |
554 if(!ifofile->menu_c_adt) | |
555 return 0; | |
556 | |
557 @@ -1396,7 +1396,7 @@ | |
558 c_adt->nr_of_vobs = info_length / sizeof(cell_adr_t); | |
559 } | |
560 | |
561 - c_adt->cell_adr_table = (cell_adr_t *)malloc(info_length); | |
562 + c_adt->cell_adr_table = malloc(info_length); | |
563 if(!c_adt->cell_adr_table) | |
564 return 0; | |
565 | |
566 @@ -1456,7 +1456,7 @@ | |
567 if(ifofile->vtsi_mat->vts_vobu_admap == 0) /* mandatory */ | |
568 return 0; | |
569 | |
570 - ifofile->vts_vobu_admap = (vobu_admap_t *)malloc(sizeof(vobu_admap_t)); | |
571 + ifofile->vts_vobu_admap = malloc(sizeof(vobu_admap_t)); | |
572 if(!ifofile->vts_vobu_admap) | |
573 return 0; | |
574 | |
575 @@ -1488,7 +1488,7 @@ | |
576 return 0; | |
577 } | |
578 | |
579 - ifofile->menu_vobu_admap = (vobu_admap_t *)malloc(sizeof(vobu_admap_t)); | |
580 + ifofile->menu_vobu_admap = malloc(sizeof(vobu_admap_t)); | |
581 if(!ifofile->menu_vobu_admap) | |
582 return 0; | |
583 | |
584 @@ -1521,7 +1521,7 @@ | |
585 Titles with a VOBS that has no VOBUs. */ | |
586 CHECK_VALUE(info_length % sizeof(uint32_t) == 0); | |
587 | |
588 - vobu_admap->vobu_start_sectors = (uint32_t *)malloc(info_length); | |
589 + vobu_admap->vobu_start_sectors = malloc(info_length); | |
590 if(!vobu_admap->vobu_start_sectors) { | |
591 return 0; | |
592 } | |
593 @@ -1573,7 +1573,7 @@ | |
594 if(ifofile->vtsi_mat->vts_pgcit == 0) /* mandatory */ | |
595 return 0; | |
596 | |
597 - ifofile->vts_pgcit = (pgcit_t *)malloc(sizeof(pgcit_t)); | |
598 + ifofile->vts_pgcit = malloc(sizeof(pgcit_t)); | |
599 if(!ifofile->vts_pgcit) | |
600 return 0; | |
601 | |
602 @@ -1703,7 +1703,7 @@ | |
603 return 0; | |
604 } | |
605 | |
606 - ifofile->pgci_ut = (pgci_ut_t *)malloc(sizeof(pgci_ut_t)); | |
607 + ifofile->pgci_ut = malloc(sizeof(pgci_ut_t)); | |
608 if(!ifofile->pgci_ut) | |
609 return 0; | |
610 | |
611 @@ -1893,7 +1893,7 @@ | |
612 if(!DVDFileSeek_(ifofile->file, sector * DVD_BLOCK_LEN)) | |
613 return 0; | |
614 | |
615 - vts_atrt = (vts_atrt_t *)malloc(sizeof(vts_atrt_t)); | |
616 + vts_atrt = malloc(sizeof(vts_atrt_t)); | |
617 if(!vts_atrt) | |
618 return 0; | |
619 | |
620 @@ -1915,7 +1915,7 @@ | |
621 VTS_ATRT_SIZE < vts_atrt->last_byte + 1); | |
622 | |
623 info_length = vts_atrt->nr_of_vtss * sizeof(uint32_t); | |
624 - data = (uint32_t *)malloc(info_length); | |
625 + data = malloc(info_length); | |
626 if(!data) { | |
627 free(vts_atrt); | |
628 ifofile->vts_atrt = 0; | |
629 @@ -1937,7 +1937,7 @@ | |
630 } | |
631 | |
632 info_length = vts_atrt->nr_of_vtss * sizeof(vts_attributes_t); | |
633 - vts_atrt->vts = (vts_attributes_t *)malloc(info_length); | |
634 + vts_atrt->vts = malloc(info_length); | |
635 if(!vts_atrt->vts) { | |
636 free(data); | |
637 free(vts_atrt); | |
638 @@ -1993,7 +1993,7 @@ | |
639 ifofile->vmgi_mat->txtdt_mgi * DVD_BLOCK_LEN)) | |
640 return 0; | |
641 | |
642 - txtdt_mgi = (txtdt_mgi_t *)malloc(sizeof(txtdt_mgi_t)); | |
643 + txtdt_mgi = malloc(sizeof(txtdt_mgi_t)); | |
644 if(!txtdt_mgi) { | |
645 return 0; | |
646 } | |
16659 | 647 |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
648 diff -Naur dvdread.orig/ifo_read.h dvdread/ifo_read.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
649 --- dvdread.orig/ifo_read.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
650 +++ dvdread/ifo_read.h 2005-06-23 00:19:10.000000000 +0200 |
18371 | 651 @@ -20,8 +24,8 @@ |
14937 | 652 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
653 */ | |
654 | |
655 -#include <dvdread/ifo_types.h> | |
656 -#include <dvdread/dvd_reader.h> | |
657 +#include "ifo_types.h" | |
658 +#include "dvd_reader.h" | |
659 | |
660 #ifdef __cplusplus | |
661 extern "C" { | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
662 diff -Naur dvdread.orig/ifo_types.h dvdread/ifo_types.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
663 --- dvdread.orig/ifo_types.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
664 +++ dvdread/ifo_types.h 2005-06-23 00:19:10.000000000 +0200 |
18371 | 665 @@ -21,7 +25,7 @@ |
14937 | 666 */ |
667 | |
668 #include <inttypes.h> | |
669 -#include <dvdread/dvd_reader.h> | |
670 +#include "dvd_reader.h" | |
671 | |
672 | |
673 #undef ATTRIBUTE_PACKED | |
18371 | 674 @@ -394,6 +398,55 @@ |
16659 | 675 } ATTRIBUTE_PACKED user_ops_t; |
676 | |
677 /** | |
678 + * Subpicture stream mapping for a subtitle | |
679 + */ | |
680 +typedef struct { | |
681 +#ifdef WORDS_BIGENDIAN | |
682 + unsigned int present : 1; | |
683 + unsigned int zero1 : 2; | |
684 + unsigned int s_4p3 : 5; /* stream for 4:3 on any display */ | |
685 + | |
686 + unsigned int zero2 : 3; | |
687 + unsigned int s_wide : 5; /* stream for 16:9 on widescreen display */ | |
688 + | |
689 + unsigned int zero3 : 3; | |
690 + unsigned int s_lbox : 5; /* stream for 16:9 on letterboxed 4:3 display */ | |
691 + | |
692 + unsigned int zero4 : 3; | |
693 + unsigned int s_panscan : 5; /* stream for 16:9 with pan&scan data on 4:3 display */ | |
694 +#else | |
695 + unsigned int s_4p3 : 5; /* stream for 4:3 on any display */ | |
696 + unsigned int zero1 : 2; | |
697 + unsigned int present : 1; | |
698 + | |
699 + unsigned int s_wide : 5; /* stream for 16:9 on widescreen display */ | |
700 + unsigned int zero2 : 3; | |
701 + | |
702 + unsigned int s_lbox : 5; /* stream for 16:9 on letterboxed 4:3 display */ | |
703 + unsigned int zero3 : 3; | |
704 + | |
705 + unsigned int s_panscan : 5; /* stream for 16:9 with pan&scan data on 4:3 display */ | |
706 + unsigned int zero4 : 3; | |
707 +#endif | |
708 +} ATTRIBUTE_PACKED subp_mapping_t; | |
709 + | |
710 +/** | |
711 + * Audio stream mapping for a soundtrack | |
712 + */ | |
713 +typedef struct { | |
714 +#ifdef WORDS_BIGENDIAN | |
715 + unsigned int present : 1; | |
716 + unsigned int zero1 : 4; | |
717 + unsigned int s_audio : 3; | |
718 +#else | |
719 + unsigned int s_audio : 3; | |
720 + unsigned int zero1 : 4; | |
721 + unsigned int present : 1; | |
722 +#endif | |
723 + uint8_t zero2; | |
724 +} ATTRIBUTE_PACKED audio_mapping_t; | |
725 + | |
726 +/** | |
727 * Program Chain Information. | |
728 */ | |
729 typedef struct { | |
18371 | 730 @@ -402,8 +455,8 @@ |
16659 | 731 uint8_t nr_of_cells; |
732 dvd_time_t playback_time; | |
733 user_ops_t prohibited_ops; | |
734 - uint16_t audio_control[8]; /* New type? */ | |
735 - uint32_t subp_control[32]; /* New type? */ | |
736 + audio_mapping_t audio_control[8]; | |
737 + subp_mapping_t subp_control[32]; | |
738 uint16_t next_pgc_nr; | |
739 uint16_t prev_pgc_nr; | |
740 uint16_t goup_pgc_nr; | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
741 diff -Naur dvdread.orig/nav_print.c dvdread/nav_print.c |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
742 diff -Naur dvdread.orig/nav_print.h dvdread/nav_print.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
743 --- dvdread.orig/nav_print.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
744 +++ dvdread/nav_print.h 2005-06-23 00:19:10.000000000 +0200 |
18371 | 745 @@ -20,7 +24,7 @@ |
14937 | 746 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
747 */ | |
748 | |
749 -#include <dvdread/nav_types.h> | |
750 +#include "nav_types.h" | |
751 | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
752 /** |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
753 * Pretty printing of the NAV packets, PCI and DSI structs. |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
754 diff -Naur dvdread.orig/nav_read.c dvdread/nav_read.c |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
755 diff -Naur dvdread.orig/nav_read.h dvdread/nav_read.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
756 --- dvdread.orig/nav_read.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
757 +++ dvdread/nav_read.h 2005-06-23 00:19:10.000000000 +0200 |
18371 | 758 @@ -19,7 +23,7 @@ |
14937 | 759 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
760 */ | |
761 | |
762 -#include <dvdread/nav_types.h> | |
763 +#include "nav_types.h" | |
764 | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
765 /** |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
766 * Parsing of NAV data, PCI and DSI parts. |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
767 diff -Naur dvdread.orig/nav_types.h dvdread/nav_types.h |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
768 --- dvdread.orig/nav_types.h 2005-06-23 00:18:54.000000000 +0200 |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
769 +++ dvdread/nav_types.h 2005-06-23 00:19:10.000000000 +0200 |
18371 | 770 @@ -30,7 +34,7 @@ |
14937 | 771 */ |
772 | |
773 #include <inttypes.h> | |
15875
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
774 -#include <dvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */ |
50960b929dd0
update mplayer specific libdvdread diff to match v0.9.4
aurel
parents:
15535
diff
changeset
|
775 +#include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */ |
14937 | 776 |
777 | |
778 #undef ATTRIBUTE_PACKED |