[SCM] libav/experimental: Set h->cbp for ff_h264_filter_mb_fast().

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:57:58 UTC 2013


The following commit has been merged in the experimental branch:
commit a7d7cdaac7b37cdab50159547fd479585efb4315
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Jan 18 16:11:13 2010 +0000

    Set h->cbp for ff_h264_filter_mb_fast().
    
    Originally committed as revision 21287 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index e4e8556..8e2b776 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;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list