aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-19 03:14:45 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-19 03:14:45 +0000
commitc2894fbf1c15e3f8d33279948758ee830b5c9267 (patch)
tree47d63d94a6ef53df192efeeca9041fdac5d6bcf4
parent580920f8dc231c96c4d170744d2a65ab45e6b734 (diff)
downloadffmpeg-c2894fbf1c15e3f8d33279948758ee830b5c9267.tar.gz
Dont waste time initializing stuff for deblocking intra mbs, none of
it is used. Originally committed as revision 21315 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index b6134a49de..f342729fa5 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -806,6 +806,8 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb
&& (top_xy < 0 || ((qp + s->current_picture.qscale_table[top_xy ] + 1)>>1) <= qp_thresh)){
return 1;
}
+ if(IS_INTRA(mb_type))
+ return 0;
*((uint64_t*)&h->non_zero_count_cache[0+8*1])= *((uint64_t*)&h->non_zero_count[mb_xy][ 0]);
*((uint64_t*)&h->non_zero_count_cache[0+8*2])= *((uint64_t*)&h->non_zero_count[mb_xy][ 8]);