Changeset 289 in 3DVCSoftware for branches/HTM-5.1-dev0/source/App

Timestamp:

18 Feb 2013, 21:17:26 (12 years ago)

Author:

tech

Message:

Clean up of macros related to NBDV.

Location:

branches/HTM-5.1-dev0/source/App

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• TAppEncoder/TAppEncTop.cpp (modified) (1 diff)

branches/HTM-5.1-dev0/source/App/TAppDecoder/TAppDecTop.cpp

@@ -108 +108 @@
     newPicture[i] = false;
 #if FLEX_CODING_ORDER_M23723
-#if  FIX_FCO_COMP_WARNING
     m_fcoOrder[i] = ' ';
-#else
-    m_fcoOrder[i]=NULL;
-#endif
 #endif
 

branches/HTM-5.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1184 +1184 @@
   
 #if !QC_MVHEVC_B0046
-#if FIX_DEL_NULLPTR
   if ( pcPdmDepthOrg != NULL && m_uiMultiviewMvRegMode )
-#else
-  if ( pcPdmDepthOrg != NULL )
-#endif
   {
     pcPdmDepthOrg->destroy();