Changeset 1119 in 3DVCSoftware

Timestamp:

8 Nov 2014, 21:21:33 (10 years ago)

Author:

tech

Message:

Fixed wrong #if statements.

Location:

branches/HTM-12.2-dev0/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• TLibEncoder/TEncSlice.cpp (modified) (1 diff)

branches/HTM-12.2-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2762 +2762 @@
 #endif
       }
-
+#endif
 #else
       rpcSlice->setMaxNumMergeCand(MRG_MAX_NUM_CANDS - uiCode);

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

@@ -2173 +2173 @@
 #endif
       }
+#endif
 #else
       WRITE_UVLC(MRG_MAX_NUM_CANDS - pcSlice->getMaxNumMergeCand(), "five_minus_max_num_merge_cand");

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

@@ -628 +628 @@
 #endif
   }
+#endif
 #else
   rpcSlice->setMaxNumMergeCand        ( m_pcCfg->getMaxNumMergeCand()        );