Commit d1428a9e authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into... 

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 247-external-renderer-command-line
parents 9b310543 3291069a

Workspace_msvc/lib_com.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -283,7 +283,6 @@ 
    <ClInclude Include="..\lib_com\basop_util.h" />

    <ClInclude Include="..\lib_com\cnst.h" />

    <ClInclude Include="..\lib_com\common_api_types.h" />

    <ClInclude Include="..\lib_com\control.h" />

    <ClInclude Include="..\lib_com\enh1632.h" />

    <ClInclude Include="..\lib_com\enh40.h" />

    <ClInclude Include="..\lib_com\ivas_cnst.h" />

Workspace_msvc/lib_com.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -489,9 +489,6 @@ 
    <ClInclude Include="..\lib_com\basop32.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\control.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\cnst.h">

      <Filter>common_h</Filter>

    </ClInclude>

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -3503,3 +3503,5 @@ static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( 
    return IVAS_DEC_FORCE_REND_UNDEFINED;

}

#endif



#undef WMC_TOOL_SKIP

apps/encoder.c

+2 −0
Original line number Diff line number Diff line
@@ -2117,3 +2117,5 @@ static ivas_error readForcedMode( 
    return IVAS_ERR_OK;

}

#endif



#undef WMC_TOOL_SKIP

apps/renderer.c

+2 −0
Original line number Diff line number Diff line
@@ -4091,3 +4091,5 @@ static void convertOutputBuffer( 


    return;

}



#undef WMC_TOOL_SKIP