Changeset 1321 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncEntropy.cpp

Timestamp:

7 Sep 2015, 18:16:33 (9 years ago)

Author:

tech

Message:

Merged 15.0-dev0@1320.

File:

• trunk/source/Lib/TLibEncoder/TEncEntropy.cpp (modified) (1 diff)

trunk/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -119 +119 @@
 Void TEncEntropy::encodeDIS( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
 {
-#if NH_3D_FIX_TICKET_98  
   if( !pcCU->getSlice()->getDepthIntraSkipFlag() )
-#else
-  if ( !pcCU->getSlice()->getIsDepth() )
-#endif
   {
     return;