Changeset 1279 in 3DVCSoftware for branches/HTM-14.1-update-dev1/source/App/TAppEncoder

Timestamp:

15 Jul 2015, 14:57:32 (10 years ago)

Author:

tech

Message:

Merged 14.1-update-dev2@1277.

Location:

branches/HTM-14.1-update-dev1

Files:

• . (modified) (1 prop)
• source/App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)

branches/HTM-14.1-update-dev1/source/App/TAppEncoder/TAppEncTop.cpp

@@ -291 +291 @@
     m_cTEncTop.setDWeight                      ( isDepth ? m_iDWeight             : 0     );
 #endif // H_3D_VSO
-#if H_3D_IC
+#if NH_3D_IC
     m_cTEncTop.setUseIC                        ( vps.getViewIndex( layerId ) == 0 || isDepth ? false : m_abUseIC );
     m_cTEncTop.setUseICLowLatencyEnc           ( m_bUseLowLatencyICEnc );