[FFmpeg-cvslog] h264 fill_filter_caches: Dont init chroma nnz_cache.

Michael Niedermayer git at videolan.org
Fri Jun 3 03:52:12 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  3 03:43:46 2011 +0200| [9034001b17077e9da5205c4344eb1b88b9882f03] | committer: Michael Niedermayer

h264 fill_filter_caches: Dont init chroma nnz_cache.

Found-by: Dark Shikari
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9034001b17077e9da5205c4344eb1b88b9882f03
---

 libavcodec/h264.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 02152ad..d40ce0d 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2426,11 +2426,10 @@ static int fill_filter_caches(H264Context *h, int mb_type){
     if(IS_INTRA(mb_type))
         return 0;
 
-    AV_COPY64(&h->non_zero_count_cache[0+8*1], &h->non_zero_count[mb_xy][ 0]);
-    AV_COPY64(&h->non_zero_count_cache[0+8*2], &h->non_zero_count[mb_xy][ 8]);
-    AV_COPY32(&h->non_zero_count_cache[0+8*5], &h->non_zero_count[mb_xy][16]);
+    AV_COPY32(&h->non_zero_count_cache[4+8*1], &h->non_zero_count[mb_xy][ 4]);
+    AV_COPY32(&h->non_zero_count_cache[4+8*2], &h->non_zero_count[mb_xy][12]);
     AV_COPY32(&h->non_zero_count_cache[4+8*3], &h->non_zero_count[mb_xy][20]);
-    AV_COPY64(&h->non_zero_count_cache[0+8*4], &h->non_zero_count[mb_xy][24]);
+    AV_COPY32(&h->non_zero_count_cache[4+8*4], &h->non_zero_count[mb_xy][28]);
 
     h->cbp= h->cbp_table[mb_xy];
 



More information about the ffmpeg-cvslog mailing list