Commit 96c65afc authored by michael's avatar michael

GCC4 fix by (Keenan Pepper (keenanpepper gmail com)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4177 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 7d24be96
...@@ -2646,7 +2646,7 @@ Switch between ...@@ -2646,7 +2646,7 @@ Switch between
* accurate deblock filter * accurate deblock filter
*/ */
static always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int stride, PPContext *c){ static always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int stride, PPContext *c){
int64_t dc_mask, eq_mask; int64_t dc_mask, eq_mask, both_masks;
int64_t sums[10*8*2]; int64_t sums[10*8*2];
src+= step*3; // src points to begin of the 8x8 Block src+= step*3; // src points to begin of the 8x8 Block
//START_TIMER //START_TIMER
...@@ -2755,7 +2755,9 @@ asm volatile( ...@@ -2755,7 +2755,9 @@ asm volatile(
: "%"REG_a : "%"REG_a
); );
if(dc_mask & eq_mask){ both_masks = dc_mask & eq_mask;
if(both_masks){
long offset= -8*step; long offset= -8*step;
int64_t *temp_sums= sums; int64_t *temp_sums= sums;
...@@ -2930,7 +2932,7 @@ asm volatile( ...@@ -2930,7 +2932,7 @@ asm volatile(
" js 1b \n\t" " js 1b \n\t"
: "+r"(offset), "+r"(temp_sums) : "+r"(offset), "+r"(temp_sums)
: "r" ((long)step), "r"(src - offset), "m"(dc_mask & eq_mask) : "r" ((long)step), "r"(src - offset), "m"(both_masks)
); );
}else }else
src+= step; // src points to begin of the 8x8 Block src+= step; // src points to begin of the 8x8 Block
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment