Changeset 815 in SHVCSoftware for trunk/source/Lib/TLibEncoder/TEncSearch.h

Timestamp:

30 Jun 2014, 06:13:06 (10 years ago)

Author:

seregin

Message:

merge with SHM-6-dev branch

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/TLibEncoder/TEncSearch.h (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/TEncSearch.h

@@ -126 +126 @@
 
 #if SVC_EXTENSION
-  TEncTop**       m_ppcTEncTop;
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
   Bool            m_disableILP;
 #endif
-#endif //SVC_EXTENAION
+#endif //SVC_EXTENSION
 
 public:
@@ -194 +193 @@
   
   /// encoder estimation - inter prediction (non-skip)
+#if SVC_EXTENSION
+  Bool predInterSearch          ( TComDataCU* pcCU,
+#else
   Void predInterSearch          ( TComDataCU* pcCU,
+#endif
                                   TComYuv*    pcOrgYuv,
                                   TComYuv*&   rpcPredYuv,