From 79f09b3f15c53f8d661ed525d95d64bfd6f73568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= Date: Thu, 1 Dec 2016 11:44:15 +0100 Subject: [PATCH] WebM: Fix crash when there is no audio stream Sync with libsimplewebm-git: 05cfdc2 --- thirdparty/README.md | 1 + thirdparty/libsimplewebm/OpusVorbisDecoder.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/thirdparty/README.md b/thirdparty/README.md index 3adbbea59bb..4b8e6b01adf 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -98,6 +98,7 @@ Files extracted from upstream source: ## libsimplewebm - Upstream: https://github.com/zaps166/libsimplewebm +- Version: 05cfdc2 (git) - License: MIT, BSD-3-Clause diff --git a/thirdparty/libsimplewebm/OpusVorbisDecoder.cpp b/thirdparty/libsimplewebm/OpusVorbisDecoder.cpp index d7869f599b7..06447aca572 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;