aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-18 16:11:13 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-18 16:11:13 +0000
commita7d7cdaac7b37cdab50159547fd479585efb4315 (patch)
tree018bf431c24d49dffb80be98826ad566ef6eeb12 /libavcodec
parent9327042c172d9fe9136ad262771a93f72466304c (diff)
downloadffmpeg-a7d7cdaac7b37cdab50159547fd479585efb4315.tar.gz
Set h->cbp for ff_h264_filter_mb_fast().
Originally committed as revision 21287 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index e4e8556e3e..8e2b7763d5 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -813,6 +813,8 @@ static av_always_inline int fill_caches(H264Context *h, int mb_type, int for_deb
*((uint32_t*)&h->non_zero_count_cache[4+8*3])= *((uint32_t*)&h->non_zero_count[mb_xy][20]);
*((uint64_t*)&h->non_zero_count_cache[0+8*4])= *((uint64_t*)&h->non_zero_count[mb_xy][24]);
+ h->cbp= h->cbp_table[mb_xy];
+
topleft_type = 0;
topright_type = 0;
top_type = h->slice_table[top_xy ] < 0xFFFF ? s->current_picture.mb_type[top_xy] : 0;