Fix merge bug

This commit is contained in:
Matthias Neeracher 2006-10-21 09:26:42 +00:00
parent 737f2b57b4
commit aadbcdd5e7

View File

@ -55,13 +55,6 @@ VLSoundOut * VLSoundOut::Instance()
if (!sSoundScheduler.get()) if (!sSoundScheduler.get())
sSoundScheduler.reset(new VLSoundScheduler); sSoundScheduler.reset(new VLSoundScheduler);
} }
}
VLSoundOut * VLSoundOut::Instance()
{
if (!sSoundOut.get())
sSoundOut.reset(new VLAUSoundOut);
return sSoundOut.get(); return sSoundOut.get();
} }