From 9c3c199558eff0413636cdc877c13b89007d85a9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 25 Sep 2014 01:56:51 +0200 Subject: audio: remove WAVEFORMATEX from internal demuxer API Same as with the previous commit. A bit more involved due to how the code is written. --- demux/stheader.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'demux/stheader.h') diff --git a/demux/stheader.h b/demux/stheader.h index a368074d99..a7d1318ff6 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -69,9 +69,8 @@ typedef struct sh_audio { struct mp_chmap channels; bool force_channels; int bitrate; // compressed bits/sec - // win32-compatible codec parameters: - MP_WAVEFORMATEX *wf; - // note codec extradata may be either under "wf" or "codecdata" + int block_align; + int bits_per_coded_sample; unsigned char *codecdata; int codecdata_len; struct replaygain_data *replaygain_data; -- cgit v1.2.3