Merge branch 'openmw-30'

This commit is contained in:
Marc Zinnschlag 2014-05-25 11:55:25 +02:00
commit ff15601a4c

View file

@ -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);