Commit bdb27356 authored by Shane's avatar Shane Committed by Carl Eugen Hoyos

Fix intended order of operations for 4 assert() checks.

Patch by Shane, gnome42 T gmail O com

Originally committed as revision 10711 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 645f7879
...@@ -1305,7 +1305,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc21_ ## MMX(uint8_t *dst, uint8_t * ...@@ -1305,7 +1305,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc21_ ## MMX(uint8_t *dst, uint8_t *
uint64_t temp[SIZE*(SIZE<8?12:24)/4 + SIZE*SIZE/8];\ uint64_t temp[SIZE*(SIZE<8?12:24)/4 + SIZE*SIZE/8];\
uint8_t * const halfHV= (uint8_t*)temp;\ uint8_t * const halfHV= (uint8_t*)temp;\
int16_t * const tmp= ((int16_t*)temp) + SIZE*SIZE/2;\ int16_t * const tmp= ((int16_t*)temp) + SIZE*SIZE/2;\
assert((int)temp & 7 == 0);\ assert(((int)temp & 7) == 0);\
put_h264_qpel ## SIZE ## _hv_lowpass_ ## MMX(halfHV, tmp, src, SIZE, SIZE, stride);\ put_h264_qpel ## SIZE ## _hv_lowpass_ ## MMX(halfHV, tmp, src, SIZE, SIZE, stride);\
OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src, halfHV, stride, SIZE);\ OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src, halfHV, stride, SIZE);\
}\ }\
...@@ -1314,7 +1314,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc23_ ## MMX(uint8_t *dst, uint8_t * ...@@ -1314,7 +1314,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc23_ ## MMX(uint8_t *dst, uint8_t *
uint64_t temp[SIZE*(SIZE<8?12:24)/4 + SIZE*SIZE/8];\ uint64_t temp[SIZE*(SIZE<8?12:24)/4 + SIZE*SIZE/8];\
uint8_t * const halfHV= (uint8_t*)temp;\ uint8_t * const halfHV= (uint8_t*)temp;\
int16_t * const tmp= ((int16_t*)temp) + SIZE*SIZE/2;\ int16_t * const tmp= ((int16_t*)temp) + SIZE*SIZE/2;\
assert((int)temp & 7 == 0);\ assert(((int)temp & 7) == 0);\
put_h264_qpel ## SIZE ## _hv_lowpass_ ## MMX(halfHV, tmp, src, SIZE, SIZE, stride);\ put_h264_qpel ## SIZE ## _hv_lowpass_ ## MMX(halfHV, tmp, src, SIZE, SIZE, stride);\
OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src+stride, halfHV, stride, SIZE);\ OPNAME ## h264_qpel ## SIZE ## _h_lowpass_l2_ ## MMX(dst, src+stride, halfHV, stride, SIZE);\
}\ }\
...@@ -1323,7 +1323,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc12_ ## MMX(uint8_t *dst, uint8_t * ...@@ -1323,7 +1323,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc12_ ## MMX(uint8_t *dst, uint8_t *
uint64_t temp[SIZE*(SIZE<8?12:24)/4 + SIZE*SIZE/8];\ uint64_t temp[SIZE*(SIZE<8?12:24)/4 + SIZE*SIZE/8];\
int16_t * const halfV= ((int16_t*)temp) + SIZE*SIZE/2;\ int16_t * const halfV= ((int16_t*)temp) + SIZE*SIZE/2;\
uint8_t * const halfHV= ((uint8_t*)temp);\ uint8_t * const halfHV= ((uint8_t*)temp);\
assert((int)temp & 7 == 0);\ assert(((int)temp & 7) == 0);\
put_h264_qpel ## SIZE ## _hv_lowpass_ ## MMX(halfHV, halfV, src, SIZE, SIZE, stride);\ put_h264_qpel ## SIZE ## _hv_lowpass_ ## MMX(halfHV, halfV, src, SIZE, SIZE, stride);\
OPNAME ## pixels ## SIZE ## _l2_shift5_ ## MMX(dst, halfV+2, halfHV, stride, SIZE, SIZE);\ OPNAME ## pixels ## SIZE ## _l2_shift5_ ## MMX(dst, halfV+2, halfHV, stride, SIZE, SIZE);\
}\ }\
...@@ -1332,7 +1332,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc32_ ## MMX(uint8_t *dst, uint8_t * ...@@ -1332,7 +1332,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc32_ ## MMX(uint8_t *dst, uint8_t *
uint64_t temp[SIZE*(SIZE<8?12:24)/4 + SIZE*SIZE/8];\ uint64_t temp[SIZE*(SIZE<8?12:24)/4 + SIZE*SIZE/8];\
int16_t * const halfV= ((int16_t*)temp) + SIZE*SIZE/2;\ int16_t * const halfV= ((int16_t*)temp) + SIZE*SIZE/2;\
uint8_t * const halfHV= ((uint8_t*)temp);\ uint8_t * const halfHV= ((uint8_t*)temp);\
assert((int)temp & 7 == 0);\ assert(((int)temp & 7) == 0);\
put_h264_qpel ## SIZE ## _hv_lowpass_ ## MMX(halfHV, halfV, src, SIZE, SIZE, stride);\ put_h264_qpel ## SIZE ## _hv_lowpass_ ## MMX(halfHV, halfV, src, SIZE, SIZE, stride);\
OPNAME ## pixels ## SIZE ## _l2_shift5_ ## MMX(dst, halfV+3, halfHV, stride, SIZE, SIZE);\ OPNAME ## pixels ## SIZE ## _l2_shift5_ ## MMX(dst, halfV+3, halfHV, stride, SIZE, SIZE);\
}\ }\
......
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