Changeset 1118 in 3DVCSoftware for branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

Timestamp:

8 Nov 2014, 21:07:36 (9 years ago)

Author:

tech

Message:

Merged 12.2-dev1-Hisilicon@1116.

File:

• branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -957 +957 @@
     pcSlice->setRefPicList ( rcListPic );
 #endif
+#if !MTK_SINGLE_DEPTH_VPS_FLAG_J0060
 #if H_3D_SINGLE_DEPTH
 #if HHI_TOOL_PARAMETERS_I2_J0107
@@ -972 +973 @@
     pcSlice->setApplySingleDepthMode(enableSingleDepthMode);
 #endif
-#endif    
+#endif   
+#endif 
 #if SEC_ARP_VIEW_REF_CHECK_J0037 || SEC_DBBP_VIEW_REF_CHECK_J0037
     pcSlice->setDefaultRefView();