godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WebM: Fix crash when there is no audio stream 

Sync with libsimplewebm-git: 05cfdc2
This commit is contained in:
Błażej Szczygieł 2016-12-01 11:44:15 +01:00
parent d5c6806e16
commit 79f09b3f15
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
thirdparty/README.md vendored
View File

@ -98,6 +98,7 @@ Files extracted from upstream source:
## libsimplewebm ## libsimplewebm
- Upstream: https://github.com/zaps166/libsimplewebm - Upstream: https://github.com/zaps166/libsimplewebm
- Version: 05cfdc2 (git)
- License: MIT, BSD-3-Clause - License: MIT, BSD-3-Clause

5
thirdparty/libsimplewebm/OpusVorbisDecoder.cpp vendored
View File

@ -43,16 +43,17 @@ struct VorbisDecoder
OpusVorbisDecoder::OpusVorbisDecoder(const WebMDemuxer &demuxer) : OpusVorbisDecoder::OpusVorbisDecoder(const WebMDemuxer &demuxer) :
m_vorbis(NULL), m_opus(NULL), m_vorbis(NULL), m_opus(NULL),
m_numSamples(0), m_numSamples(0)
m_channels(demuxer.getChannels())
{ {
switch (demuxer.getAudioCodec()) switch (demuxer.getAudioCodec())
{ {
case WebMDemuxer::AUDIO_VORBIS: case WebMDemuxer::AUDIO_VORBIS:
m_channels = demuxer.getChannels();
if (openVorbis(demuxer)) if (openVorbis(demuxer))
return; return;
break; break;
case WebMDemuxer::AUDIO_OPUS: case WebMDemuxer::AUDIO_OPUS:
m_channels = demuxer.getChannels();
if (openOpus(demuxer)) if (openOpus(demuxer))
return; return;
break; break;