From 27edf28be2772229a7974a007313ea30d92c3ffd Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- mpeglib/lib/mpegplay/macroBlock.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mpeglib/lib/mpegplay/macroBlock.cpp') diff --git a/mpeglib/lib/mpegplay/macroBlock.cpp b/mpeglib/lib/mpegplay/macroBlock.cpp index 730fdd62..5436dbd7 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 tqmask, i; + int mask, 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 (tqmask = 32, i = 0; i < 6; tqmask >>= 1, i++) { + for (mask = 32, i = 0; i < 6; mask >>= 1, i++) { /* If block exists... */ - if ((mb_intra) || (cbp & tqmask)) { + if ((mb_intra) || (cbp & mask)) { zero_block_flag = 0; //copyFunctions->endNOFloatSection(); decoderClass->ParseReconBlock(i,mb_intra, -- cgit v1.2.1