From 79f09b3f15c53f8d661ed525d95d64bfd6f73568 Mon Sep 17 00:00:00 2001 From: Błażej Szczygieł Date: Thu, 1 Dec 2016 11:44:15 +0100 Subject: WebM: Fix crash when there is no audio stream Sync with libsimplewebm-git: 05cfdc2 --- thirdparty/libsimplewebm/OpusVorbisDecoder.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'thirdparty/libsimplewebm') diff --git a/thirdparty/libsimplewebm/OpusVorbisDecoder.cpp b/thirdparty/libsimplewebm/OpusVorbisDecoder.cpp index d7869f599..06447aca5 100644 --- a/thirdparty/libsimplewebm/OpusVorbisDecoder.cpp +++ b/thirdparty/libsimplewebm/OpusVorbisDecoder.cpp @@ -43,16 +43,17 @@ struct VorbisDecoder OpusVorbisDecoder::OpusVorbisDecoder(const WebMDemuxer &demuxer) : m_vorbis(NULL), m_opus(NULL), - m_numSamples(0), - m_channels(demuxer.getChannels()) + m_numSamples(0) { switch (demuxer.getAudioCodec()) { case WebMDemuxer::AUDIO_VORBIS: + m_channels = demuxer.getChannels(); if (openVorbis(demuxer)) return; break; case WebMDemuxer::AUDIO_OPUS: + m_channels = demuxer.getChannels(); if (openOpus(demuxer)) return; break; -- cgit v1.2.3-70-g09d2