path: root/audio/decode
diff options
authorwm4 <wm4@nowhere>2013-11-02 15:10:28 +0100
committerwm4 <wm4@nowhere>2013-11-02 15:14:12 +0100
commit4d903127ad799e84cc19f8ff4f5c5abf0d35a9a8 (patch)
tree64fcf21f27827229c5c493f370045e9bc528d0ff /audio/decode
parent7b52ba87a3d1ca23df677f7a681839d821b21375 (diff)
demux: rename Windows symbols
There are some Microsoft Windows symbols which are traditionally used by the mplayer core, because it used to be convenient (avi was the big format, using binary windows decoders made sense...). So these symbols have the exact same definition as the Windows one, and if mplayer is compiled on Windows, the symbols from windows.h are used. This broke recently just because some files were shuffled around, and the symbols defined in ms_hdr.h collided with windows.h ones. Since we don't have windows binary decoders anymore, there's not the slightest reason our symbols should have the same names. Rename them to reduce the risk for collision, and to fix the recent regression. Drop WAVEFORMATEXTENSIBLE, because it's mostly unused. ao_dsound defines its own version if the windows headers don't define it, and ao_wasapi is not available on systems where this symbol is missing. Also reindent ms_hdr.h.
Diffstat (limited to 'audio/decode')
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 8f965e962b..abd47f2fa3 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -190,7 +190,7 @@ static int setup_format(sh_audio_t *sh_audio,
return 0;
-static void set_from_wf(AVCodecContext *avctx, WAVEFORMATEX *wf)
+static void set_from_wf(AVCodecContext *avctx, MP_WAVEFORMATEX *wf)
avctx->channels = wf->nChannels;
avctx->sample_rate = wf->nSamplesPerSec;