summaryrefslogtreecommitdiffstats
path: root/demux/ms_hdr.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-09-25 02:22:44 +0200
committerwm4 <wm4@nowhere>2014-09-25 02:22:50 +0200
commit7aa933cc9ee4e504dc3bb716a3736d138c5bd7c2 (patch)
tree91372f53eeaf24f76f1437e6c9374aac08a856d0 /demux/ms_hdr.h
parent9c3c199558eff0413636cdc877c13b89007d85a9 (diff)
downloadmpv-7aa933cc9ee4e504dc3bb716a3736d138c5bd7c2.tar.bz2
mpv-7aa933cc9ee4e504dc3bb716a3736d138c5bd7c2.tar.xz
demux_mkv: get rid of MS structs
See previous commits. This finally replaces directly reading the file data into a struct with reading them manually. In theory this is more portable (no alignment issues and other things). For the most part, it's nice seeing this gone.
Diffstat (limited to 'demux/ms_hdr.h')
-rw-r--r--demux/ms_hdr.h52
1 files changed, 0 insertions, 52 deletions
diff --git a/demux/ms_hdr.h b/demux/ms_hdr.h
deleted file mode 100644
index 795b070cef..0000000000
--- a/demux/ms_hdr.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 "osdep/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 */