Skip to content

Commit

Permalink
Applied Astyle
Browse files Browse the repository at this point in the history
  • Loading branch information
RobertBeckebans committed Mar 6, 2022
1 parent d212e5b commit 2ce90cf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions RELEASE-NOTES.md
Expand Up @@ -64,6 +64,8 @@ This patch also contains a couple of func_group related bugfixes. func_group wor

[MISCELLANEOUS]

* Stencil shadows work again (thanks to Stephen Pridham)

* Added CMake options STANDALONE and DOOM_CLASSIC

* Added command convertMapQuakeToDoom `<map>` that expects a Quake 1 .map in the Valve220 format and does some Doom 3 specific fixes
Expand Down
10 changes: 5 additions & 5 deletions neo/renderer/Cinematic.cpp
Expand Up @@ -817,7 +817,7 @@ void idCinematicLocal::FFMPEGReset()
//startTime = 0;

framePos = -1;

// SRS - If we have an ffmpeg audio context and are not looping, or skipLag is true, reset audio to release any stale buffers
if( dec_ctx2 && ( !( looping && status == FMV_EOF ) || skipLag ) )
{
Expand Down Expand Up @@ -934,7 +934,7 @@ bool idCinematicLocal::InitFromBinkDecFile( const char* qpath, bool amilooping )
void idCinematicLocal::BinkDecReset()
{
framePos = -1;

// SRS - If we have bink audio tracks, reset audio to release any stale buffers (even if looping)
if( audioTracks > 0 )
{
Expand Down Expand Up @@ -989,7 +989,7 @@ bool idCinematicLocal::InitFromFile( const char* qpath, bool amilooping )
temp = fileName.StripFileExtension() + ".bik";
skipLag = false; // SRS - Enable lag buffer for ffmpeg bik decoder AV sync

// SRS - Support RoQ cinematic playback via ffmpeg decoder - better quality plus audio support
// SRS - Support RoQ cinematic playback via ffmpeg decoder - better quality plus audio support
}
else
{
Expand All @@ -998,7 +998,7 @@ bool idCinematicLocal::InitFromFile( const char* qpath, bool amilooping )
skipLag = true; // SRS - Disable lag buffer for ffmpeg RoQ decoder AV sync
}
{
// SRS End
// SRS End

animationLength = 0;
fileName = temp;
Expand Down Expand Up @@ -1084,7 +1084,7 @@ void idCinematicLocal::Close()
if( dec_ctx2 )
{
avcodec_free_context( &dec_ctx2 );

// SRS - Free resample context if we were decoding planar audio
if( swr_ctx )
{
Expand Down
2 changes: 1 addition & 1 deletion neo/sound/OpenAL/AL_CinematicAudio.cpp
Expand Up @@ -247,7 +247,7 @@ void CinematicAudio_OpenAL::ShutdownAudio()
{
alDeleteBuffers( NUM_BUFFERS, alMusicBuffercin );
}

while( !tBuffer.empty() )
{
uint8_t* tempdata = tBuffer.front();
Expand Down

0 comments on commit 2ce90cf

Please sign in to comment.