Commit 40da5a61 authored by Michael Smith's avatar Michael Smith
Browse files

Fix for a minor typo in vorbisfile headers - woould have affected users of the
new generic interface.

Added some casts into the all-new ov_open() to stop compiler warnings.

svn path=/trunk/vorbis/; revision=342
parent 0f6113fd
......@@ -12,7 +12,7 @@
********************************************************************
function: stdio-based convenience library for opening/seeking/decoding
last mod: $Id: vorbisfile.h,v 1.3 2000/04/21 09:35:03 msmith Exp $
last mod: $Id: vorbisfile.h,v 1.4 2000/04/23 15:34:12 msmith Exp $
********************************************************************/
......@@ -79,7 +79,7 @@ typedef struct {
extern int ov_clear(OggVorbis_File *vf);
extern int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes);
extern int ov_open_callback(void *datasource, OggVorbis_File *vf,
extern int ov_open_callbacks(void *datasource, OggVorbis_File *vf,
char *initial, long ibytes, ov_callbacks callbacks);
extern long ov_bitrate(OggVorbis_File *vf,int i);
......
......@@ -12,7 +12,7 @@
********************************************************************
function: stdio-based convenience library for opening/seeking/decoding
last mod: $Id: vorbisfile.c,v 1.20 2000/04/21 09:35:03 msmith Exp $
last mod: $Id: vorbisfile.c,v 1.21 2000/04/23 15:34:12 msmith Exp $
********************************************************************/
......@@ -546,10 +546,11 @@ int ov_clear(OggVorbis_File *vf){
int ov_open(FILE *f,OggVorbis_File *vf,char *initial,long ibytes){
ov_callbacks callbacks = {
fread,
fseek,
fclose,
ftell};
(size_t (*)(void *, size_t, size_t, void *)) fread,
(int (*)(void *, long, int)) fseek,
(int (*)(void *)) fclose,
(long (*)(void *)) ftell
};
return ov_open_callbacks((void *)f, vf, initial, ibytes, callbacks);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment