mirror of https://github.com/mpv-player/mpv
4d903127ad
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. |
||
|---|---|---|
| .. | ||
| codec_tags.c | ||
| codec_tags.h | ||
| demux.c | ||
| demux.h | ||
| demux_cue.c | ||
| demux_edl.c | ||
| demux_lavf.c | ||
| demux_libass.c | ||
| demux_mf.c | ||
| demux_mkv.c | ||
| demux_mng.c | ||
| demux_packet.h | ||
| demux_playlist.c | ||
| demux_raw.c | ||
| demux_subreader.c | ||
| ebml.c | ||
| ebml.h | ||
| matroska.h | ||
| mf.c | ||
| mf.h | ||
| ms_hdr.h | ||
| stheader.h | ||