mirror of
https://github.com/mpv-player/mpv
synced 2024-12-22 14:52:43 +00:00
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.
53 lines
1.6 KiB
C
53 lines
1.6 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPLAYER_MS_HDR_H
|
|
#define MPLAYER_MS_HDR_H
|
|
|
|
#include "compat/mpbswap.h"
|
|
#include "video/img_fourcc.h"
|
|
|
|
// These structs must be binary-compatible to the native win32 types,
|
|
// because demux_mkv.c uses them directly.
|
|
|
|
typedef struct __attribute__((__packed__)) MP_WAVEFORMATEX {
|
|
unsigned short wFormatTag;
|
|
unsigned short nChannels;
|
|
unsigned int nSamplesPerSec;
|
|
unsigned int nAvgBytesPerSec;
|
|
unsigned short nBlockAlign;
|
|
unsigned short wBitsPerSample;
|
|
unsigned short cbSize;
|
|
} MP_WAVEFORMATEX;
|
|
|
|
typedef struct __attribute__((__packed__)) MP_BITMAPINFOHEADER {
|
|
int biSize;
|
|
int biWidth;
|
|
int biHeight;
|
|
short biPlanes;
|
|
short biBitCount;
|
|
int biCompression;
|
|
int biSizeImage;
|
|
int biXPelsPerMeter;
|
|
int biYPelsPerMeter;
|
|
int biClrUsed;
|
|
int biClrImportant;
|
|
} MP_BITMAPINFOHEADER;
|
|
|
|
#endif /* MPLAYER_MS_HDR_H */
|