summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-12-24 03:23:38 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-12-24 03:23:38 +0000
commit62ea19c061d0a1fdc23fe3d7cf61139c44a15fcd (patch)
tree464eb4b50c263acf77bfd3fe6258d709ef6947bf /libavcodec
parentc26436ec46bd066794e646cd5607624a1a63ad11 (diff)
downloadffmpeg-62ea19c061d0a1fdc23fe3d7cf61139c44a15fcd.tar.gz
Optimize pred_pskip_motion()
7 cpu cycles faster on pentium dual. Originally committed as revision 16304 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ccae2bb8f6..fc689988ab 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -873,8 +873,8 @@ static inline void pred_pskip_motion(H264Context * const h, int * const mx, int
tprintf(h->s.avctx, "pred_pskip: (%d) (%d) at %2d %2d\n", top_ref, left_ref, h->s.mb_x, h->s.mb_y);
if(top_ref == PART_NOT_AVAILABLE || left_ref == PART_NOT_AVAILABLE
- || (top_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ] == 0)
- || (left_ref == 0 && *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ] == 0)){
+ || !( top_ref | *(uint32_t*)h->mv_cache[0][ scan8[0] - 8 ])
+ || !(left_ref | *(uint32_t*)h->mv_cache[0][ scan8[0] - 1 ])){
*mx = *my = 0;
return;