Changeset 302 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibCommon/CommonDef.h

Timestamp:

28 Jun 2013, 00:40:00 (12 years ago)

Author:

seregin

Message:

update to HM11.0

File:

• branches/SHM-2.1-dev/source/Lib/TLibCommon/CommonDef.h (modified) (2 diffs)

branches/SHM-2.1-dev/source/Lib/TLibCommon/CommonDef.h

@@ -56 +56 @@
 // ====================================================================================================================
 
+#if SVC_EXTENSION
 #define NV_VERSION        "2.1"                 ///< Current software version
+#else
+#define NV_VERSION        "11.0"                ///< Current software version
+#endif
 
 // ====================================================================================================================
@@ -110 +114 @@
 #define MAX_NUM_REF_PICS            16          ///< max. number of pictures used for reference
 #define MAX_NUM_REF                 16          ///< max. number of entries in picture reference list
-#if !L0034_COMBINED_LIST_CLEANUP
-#define MAX_NUM_REF_LC              MAX_NUM_REF_PICS  // TODO: remove this macro definition (leftover from combined list concept)
-#endif
 
 #define MAX_UINT                    0xFFFFFFFFU ///< max. value of unsigned 32-bit integer