shithub: openh264

Download patch

ref: e306888d0c4a2a8c7c3aea7a752d9930ef5fb70e
parent: 977768ac880deaa63c43998a84d0b0f68651f67e
author: Martin Storsjö <[email protected]>
date: Tue Jan 28 05:32:38 EST 2014 

Unify the codepaths for WELS_GET_PERFIX_BITS at the second place

This changes a second use of the macro which was missed in
60e0255677.

This avoids warnings about unused local variables in 64 bit
builds in MSVC.


--- a/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
+++ b/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
@@ -620,7 +620,7 @@
 static int32_t	CavlcGetRunBefore (int32_t iRun[16], SReadBitsCache* pBitsCache, uint8_t uiTotalCoeff,
                                    SVlcTable* pVlcTable, int32_t iZerosLeft) {
   int32_t i, iUsedBits = 0;
-  uint32_t uiCount, uiValue, uiCache32Bit, iPrefixBits;
+  uint32_t uiCount, uiValue, iPrefixBits;
 
   for (i = 0; i < uiTotalCoeff - 1; i++) {
     if (iZerosLeft > 0) {
@@ -639,12 +639,7 @@
           iRun[i] = pVlcTable->kpZeroTable[6][uiValue][0];
         } else {
           if (pBitsCache->uiRemainBits < 16) SHIFT_BUFFER (pBitsCache);
-#if defined(_MSC_VER) && defined(_M_IX86)
-          uiCache32Bit = pBitsCache->uiCache32Bit;
-          WELS_GET_PREFIX_BITS (uiCache32Bit, iPrefixBits);
-#else
-          iPrefixBits = GetPrefixBits (pBitsCache->uiCache32Bit);
-#endif
+          WELS_GET_PREFIX_BITS (pBitsCache->uiCache32Bit, iPrefixBits);
           iRun[i] = iPrefixBits + 6;
           if (iRun[i] > iZerosLeft)
             return -1;