Changeset 280 in 3DVCSoftware for branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComPic.cpp

Timestamp:

14 Feb 2013, 23:41:41 (12 years ago)

Author:

tech

Message:

Integration of branch dev 2.

File:

• branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComPic.cpp (modified) (2 diffs)

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComPic.cpp

@@ -76 +76 @@
   m_pcUsedPelsMap     = NULL;
 #endif
-#if SONY_COLPIC_AVAILABILITY
-  m_iViewOrderIdx     = 0;
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  m_iViewOrderIdx     = 0;    // will be changed to view_id
 #endif
   m_aaiCodedScale     = 0;
@@ -703 +703 @@
 }
 
+
 //! \}