mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-14 01:19:59 +00:00
Merge branch 'openmw-30'
This commit is contained in:
commit
ff15601a4c
@ -970,8 +970,13 @@ void VideoState::init(const std::string& resourceName)
|
||||
MWBase::Environment::get().getSoundManager()->pauseSounds();
|
||||
|
||||
this->external_clock_base = av_gettime();
|
||||
#ifdef WIN32
|
||||
// FIXME: Need FFmpeg FLTP audio support for BIK video format
|
||||
std::cout<<"Sound temporarily disabled for \""+resourceName+"\""<<std::endl;
|
||||
#else
|
||||
if(audio_index >= 0)
|
||||
this->stream_open(audio_index, this->format_ctx);
|
||||
#endif
|
||||
if(video_index >= 0)
|
||||
{
|
||||
this->stream_open(video_index, this->format_ctx);
|
||||
|
Loading…
x
Reference in New Issue
Block a user