Changeset 363 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder

Timestamp:

3 May 2013, 15:59:14 (12 years ago)

Author:

tech

Message:

Fixed wrongly merged parts.

Location:

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder

Files:

• TEncCfg.h (modified) (1 diff)
• TEncGOP.h (modified) (1 diff)

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -97 +97 @@
 #if H_MV
     ::memset( m_interViewRefs,   0, sizeof(m_interViewRefs) );
-    ::memset( m_interViewRefPosL[0], -1, sizeof(m_interViewRefPosL[0]) );    ::memset( m_interViewRefPosL[1], -1, sizeof(m_interViewRefPosL[1]) );#endif
+    ::memset( m_interViewRefPosL[0], -1, sizeof(m_interViewRefPosL[0]) );    ::memset( m_interViewRefPosL[1], -1, sizeof(m_interViewRefPosL[1]) );
+#endif
   }
 };

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h

@@ -211 +211 @@
   }
 #endif
+#endif
 #if H_MV
    Void  xSetRefPicListModificationsMvc( TComSlice* pcSlice, UInt uiPOCCurr, UInt iGOPid );