diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-12-02 08:58:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 08:58:08 +0100 |
| commit | 4d8bed33215c005f6aa6fcb34d5d343ee3bee23e (patch) | |
| tree | c133bb4afc2467c57acff31fc42555b84d53008d /thirdparty/libsimplewebm/OpusVorbisDecoder.cpp | |
| parent | 752f630f4e5bf17019de66cf2b0f33cf419ab525 (diff) | |
| parent | 79f09b3f15c53f8d661ed525d95d64bfd6f73568 (diff) | |
| download | redot-engine-4d8bed33215c005f6aa6fcb34d5d343ee3bee23e.tar.gz | |
Merge pull request #7221 from zaps166/webm_crashfix
WebM: Fix crash when there is no audio stream
Diffstat (limited to 'thirdparty/libsimplewebm/OpusVorbisDecoder.cpp')
| -rw-r--r-- | thirdparty/libsimplewebm/OpusVorbisDecoder.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/thirdparty/libsimplewebm/OpusVorbisDecoder.cpp b/thirdparty/libsimplewebm/OpusVorbisDecoder.cpp index d7869f599b..06447aca57 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; |