diff options
Diffstat (limited to 'mpeglib/lib/mpegplay/macroBlock.cpp')
| -rw-r--r-- | mpeglib/lib/mpegplay/macroBlock.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mpeglib/lib/mpegplay/macroBlock.cpp b/mpeglib/lib/mpegplay/macroBlock.cpp index 2e35e551..730fdd62 100644 --- a/mpeglib/lib/mpegplay/macroBlock.cpp +++ b/mpeglib/lib/mpegplay/macroBlock.cpp @@ -329,7 +329,7 @@ int MacroBlock::reconstruct(int& recon_right_for, int& mb_motion_forw, int& mb_motion_back, PictureArray* pictureArray) { - int mask, i; + int tqmask, i; int zero_block_flag; int mb_row; int mb_col; @@ -364,11 +364,11 @@ int MacroBlock::reconstruct(int& recon_right_for, copyFunctions->startNOFloatSection(); - for (mask = 32, i = 0; i < 6; mask >>= 1, i++) { + for (tqmask = 32, i = 0; i < 6; tqmask >>= 1, i++) { /* If block exists... */ - if ((mb_intra) || (cbp & mask)) { + if ((mb_intra) || (cbp & tqmask)) { zero_block_flag = 0; //copyFunctions->endNOFloatSection(); decoderClass->ParseReconBlock(i,mb_intra, @@ -1067,7 +1067,7 @@ void MacroBlock::ReconSkippedBlock(unsigned char* source, if (width == 16) { if ((!right_half) && (!down_half)) { if (right & 0x1) { - /* No alignment, use bye copy */ + /* No tqalignment, use bye copy */ for (rr = 0; rr < 16; rr++) { memcpy(dest,source,sizeof(char)*16); |