Changeset 597 in SHVCSoftware for trunk/source/App

Timestamp:

2 Feb 2014, 19:32:40 (11 years ago)

Author:

seregin

Message:

merge with SHM-5.0-dev branch

Location:

trunk/source

Files:

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

trunk/source/App/TAppEncoder/TAppEncTop.cpp

@@ -977 +977 @@
       g_uiPCMBitDepthChroma = m_bPCMInputBitDepthFlag ? m_acLayerCfg[layerId].m_inputBitDepthC : m_acLayerCfg[layerId].m_internalBitDepthC;
 #endif
-      vps->setLayerIdIncludedFlag(true, setId, layerId);
+      if( layerId <= setId )
+      {
+        vps->setLayerIdIncludedFlag(true, setId, layerId);
+      }
+      else
+      {
+        vps->setLayerIdIncludedFlag(false, setId, layerId);
+      }
     }
   }