Mercurial > mplayer.hg
view mp3lib/mp3.h @ 26146:20a126aaa756
ve_vfw.c: #include aviheader.h instead of wine avifmt.h
Compilation was broken after libmpdemux/muxer.h started including
libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and
loader/wine/avifmt.h, and the latter has definitions that conflict with
aviheader.h ones. Fix by removing the avifmt.h include.
I did not carefully check that changing the includes doesn't break
any ve_vfw.c code. However it at least fixes compilation, and if the
avifmt.h versions differ in some significant way then the code is
fundamentally broken anyway: ve_vfw cannot use different versions of
the avi struct definitions when it also uses shared muxer.h types
(those must use the standard definitions to keep the type compatible
with what's used in other files).
author | uau |
---|---|
date | Thu, 06 Mar 2008 01:57:26 +0000 |
parents | f580a7755ac5 |
children | e7c989f7a7c9 |
line wrap: on
line source
/* MP3 Player Library 2.0 (C) 1999 A'rpi/Astral&ESP-team */ /* decoder level: */ #ifdef USE_FAKE_MONO extern void MP3_Init(int fakemono); #else extern void MP3_Init(); #endif extern int MP3_Open(char *filename,int buffsize); extern void MP3_SeekFrame(int num,int dir); extern void MP3_SeekForward(int num); extern int MP3_PrintTAG(void); extern int MP3_DecodeFrame(unsigned char *hova,short single); extern int MP3_FillBuffers(void); extern void MP3_PrintHeader(void); extern void MP3_Close(void); /* public variables: */ extern int MP3_eof; // set if EOF reached extern int MP3_pause; // lock playing /* informational: */ extern int MP3_filesize; // filesize extern int MP3_frames; // current frame no extern int MP3_fpos; // current file pos extern int MP3_framesize; // current framesize in bytes (including header) extern int MP3_bitrate; // current bitrate (kbits) extern int MP3_samplerate; // current sampling freq (Hz) extern int MP3_channels; extern int MP3_bps; /* player level: */ extern int MP3_OpenDevice(char *devname); /* devname can be NULL for default) */ extern void MP3_Play(void); extern void MP3_Stop(void); extern void MP3_CloseDevice(void);