Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

demux: rename Windows symbols

Browse Source 
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.
This commit is contained in:
wm4
2013-11-02 15:10:28 +01:00
parent 7b52ba87a3
commit 4d903127ad
6 changed files with 107 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
audio/decode/ad_lavc.c
View File

@@ -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;