Changeset 1386 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComMotionInfo.h

Timestamp:

13 Nov 2015, 16:29:39 (9 years ago)

Author:

tech

Message:

Merged 15.1-dev1@1381.

File:

• trunk/source/Lib/TLibCommon/TComMotionInfo.h (modified) (3 diffs)

trunk/source/Lib/TLibCommon/TComMotionInfo.h

@@ -57 +57 @@
 typedef struct _AMVPInfo
 {
-  TComMv m_acMvCand[ AMVP_MAX_NUM_CANDS_MEM ];  ///< array of motion vector predictor candidates
+  TComMv m_acMvCand[ AMVP_MAX_NUM_CANDS ];  ///< array of motion vector predictor candidates
   Int    iN;                                ///< number of motion vector predictor candidates
 } AMVPInfo;
@@ -122 +122 @@
   TComMv*   m_pcMv;
   TComMv*   m_pcMvd;
-  Char*     m_piRefIdx;
+  SChar*    m_piRefIdx;
   UInt      m_uiNumPartition;
   AMVPInfo  m_cAMVPInfo;
@@ -188 +188 @@
   }
   
-  Void compress(Char* pePredMode, Int scale); 
+  Void compress(SChar* pePredMode, Int scale);
 #if NH_MV
-  Void print   (Char* pePredMode);
+  Void print   (SChar* pePredMode);
 #endif
 };