summaryrefslogtreecommitdiff
path: root/src/input/libdvdnav
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2003-08-25 21:51:37 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2003-08-25 21:51:37 +0000
commitbabb07bcbec3674a3f542cf6ae3f2d6b212a3ed4 (patch)
tree3074007521ca0f6f2b730ac3e85003bdac8d4fdd /src/input/libdvdnav
parentca053acfc8a4a11274f1f0978bd0f52b9ac8cc06 (diff)
downloadxine-lib-babb07bcbec3674a3f542cf6ae3f2d6b212a3ed4.tar.gz
xine-lib-babb07bcbec3674a3f542cf6ae3f2d6b212a3ed4.tar.bz2
Reduce GCC verbosity (various prototype declaration fixes). ffmpeg, wine and fft*post are untouched (fft: for now).
CVS patchset: 5310 CVS date: 2003/08/25 21:51:37
Diffstat (limited to 'src/input/libdvdnav')
-rw-r--r--src/input/libdvdnav/decoder.c5
-rw-r--r--src/input/libdvdnav/dvd_reader.c4
-rw-r--r--src/input/libdvdnav/dvd_reader.h6
-rw-r--r--src/input/libdvdnav/dvd_udf.c3
-rw-r--r--src/input/libdvdnav/remap.c10
5 files changed, 17 insertions, 11 deletions
diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c
index 7268bd79e..44b3b24e2 100644
--- a/src/input/libdvdnav/decoder.c
+++ b/src/input/libdvdnav/decoder.c
@@ -18,7 +18,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: decoder.c,v 1.11 2003/05/16 09:56:50 mroi Exp $
+ * $Id: decoder.c,v 1.12 2003/08/25 21:51:40 f1rmb Exp $
*
*/
@@ -125,7 +125,8 @@ static uint16_t eval_reg_or_data(command_t* command, int32_t imm, int32_t start)
xBBB_BBBB, if immediate use all 7 bits for data else use
lower four bits for the general purpose register number. */
/* Evaluates gprm or data depending on bit, data is in byte n */
-uint16_t eval_reg_or_data_2(command_t* command, int32_t imm, int32_t start) {
+static uint16_t eval_reg_or_data_2(command_t* command,
+ int32_t imm, int32_t start) {
if(imm) /* immediate */
return vm_getbits(command, (start - 1), 7);
else
diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c
index 40bed7ea6..09879e29e 100644
--- a/src/input/libdvdnav/dvd_reader.c
+++ b/src/input/libdvdnav/dvd_reader.c
@@ -95,6 +95,10 @@ struct dvd_file_s {
ssize_t filesize;
};
+int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
+ size_t block_count, unsigned char *data,
+ int encrypted );
+
/**
* Set the level of caching on udf
* level = 0 (no caching)
diff --git a/src/input/libdvdnav/dvd_reader.h b/src/input/libdvdnav/dvd_reader.h
index edd18da77..c7d220f80 100644
--- a/src/input/libdvdnav/dvd_reader.h
+++ b/src/input/libdvdnav/dvd_reader.h
@@ -266,6 +266,12 @@ int DVDISOVolumeInfo( dvd_reader_t *, char *, unsigned int,
*/
int DVDUDFCacheLevel( dvd_reader_t *, int );
+/**
+ * COMMENT ME
+ */
+void *GetUDFCacheHandle(dvd_reader_t *device);
+void SetUDFCacheHandle(dvd_reader_t *device, void *cache);
+
#ifdef __cplusplus
};
#endif
diff --git a/src/input/libdvdnav/dvd_udf.c b/src/input/libdvdnav/dvd_udf.c
index a834cc8ac..d7adac891 100644
--- a/src/input/libdvdnav/dvd_udf.c
+++ b/src/input/libdvdnav/dvd_udf.c
@@ -144,9 +144,6 @@ typedef enum {
PartitionCache, RootICBCache, LBUDFCache, MapCache, AVDPCache, PVDCache
} UDFCacheType;
-extern void *GetUDFCacheHandle(dvd_reader_t *device);
-extern void SetUDFCacheHandle(dvd_reader_t *device, void *cache);
-
void FreeUDFCache(void *cache)
{
struct udf_cache *c = (struct udf_cache *)cache;
diff --git a/src/input/libdvdnav/remap.c b/src/input/libdvdnav/remap.c
index 3019c514a..8fffc6e29 100644
--- a/src/input/libdvdnav/remap.c
+++ b/src/input/libdvdnav/remap.c
@@ -15,7 +15,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: remap.c,v 1.3 2003/04/29 15:58:30 jcdutton Exp $
+ * $Id: remap.c,v 1.4 2003/08/25 21:51:40 f1rmb Exp $
*/
#include <stdlib.h>
@@ -51,7 +51,7 @@ struct remap_s {
struct block_s *blocks;
};
-remap_t* remap_new( char *title) {
+static remap_t* remap_new( char *title) {
remap_t *map = malloc( sizeof(remap_t));
map->title = strdup(title);
map->maxblocks = 0;
@@ -142,10 +142,8 @@ static void remap_add_node( remap_t *map, block_t block) {
}
}
-int parseblock(
- char *buf, int *dom, int *tt, int *pg,
- unsigned long *start, unsigned long *end)
-{
+static int parseblock(char *buf, int *dom, int *tt, int *pg,
+ unsigned long *start, unsigned long *end) {
long tmp;
char *tok;
char *epos;