summaryrefslogtreecommitdiffstats
path: root/demux/codec_tags.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-09-25 01:56:51 +0200
committerwm4 <wm4@nowhere>2014-09-25 01:56:51 +0200
commit9c3c199558eff0413636cdc877c13b89007d85a9 (patch)
treecf9d6c3eae2d9214776c1269a69e73ba65a938be /demux/codec_tags.c
parentfd7dde404d95f9c7f703917578111317d4ab85cd (diff)
downloadmpv-9c3c199558eff0413636cdc877c13b89007d85a9.tar.bz2
mpv-9c3c199558eff0413636cdc877c13b89007d85a9.tar.xz
audio: remove WAVEFORMATEX from internal demuxer API
Same as with the previous commit. A bit more involved due to how the code is written.
Diffstat (limited to 'demux/codec_tags.c')
-rw-r--r--demux/codec_tags.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/codec_tags.c b/demux/codec_tags.c
index 0833757b31..451d9539df 100644
--- a/demux/codec_tags.c
+++ b/demux/codec_tags.c
@@ -386,9 +386,9 @@ void mp_set_codec_from_tag(struct sh_stream *sh)
sh->codec = lookup_tag(mp_audio_codec_tags,
avformat_get_riff_audio_tags(),
sh->format);
- if (sh->audio && sh->audio->wf) {
+ if (sh->audio && sh->audio->bits_per_coded_sample) {
const char *codec =
- map_audio_pcm_tag(sh->format, sh->audio->wf->wBitsPerSample);
+ map_audio_pcm_tag(sh->format, sh->audio->bits_per_coded_sample);
if (codec)
sh->codec = codec;
}