Commit 81a64a38 authored by Jan Brouwer's avatar Jan Brouwer
Browse files

fixed merge error, put statement under compile flag

parent 6bdf6cb4

apps/decoder.c

+3 −5
Original line number Diff line number Diff line
@@ -607,11 +607,7 @@ int main( 
        }



#ifdef CONTROL_METADATA_REVERB

#if ( defined SPLIT_REND_WITH_HEAD_ROT ) || ( defined DEBUGGING )

        if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )

#else

        if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename ) != IVAS_ERR_OK )

#endif

#else

        if ( RenderConfigReader_read( renderConfigReader, &renderConfig ) != IVAS_ERR_OK )

#endif
@@ -631,7 +627,7 @@ int main( 
                    goto cleanup;

                }

            }

            else

            else if ( error != IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING )

            {

                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );

                goto cleanup;
@@ -1549,7 +1545,9 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );

#endif

    fprintf( stdout, "-exof File          : External orientation file for external orientation trajectory\n" );

#ifdef CONTROL_METADATA_REVERB

    fprintf( stdout, "-aeid ID            : Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration\n" );

#endif

#ifdef DEBUG_MODE_INFO

#ifdef DEBUG_MODE_INFO_TWEAK

    fprintf( stdout, "-info <folder>      : specify subfolder name for debug output\n" );