diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-03 03:43:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-03 03:46:13 +0200 |
| commit | 9034001b17077e9da5205c4344eb1b88b9882f03 (patch) | |
| tree | 5976010088b2b497d514916a91c8bd4fe1e76294 | |
| parent | dd471070215c5ca78f2cb99efc66ea5e33b39808 (diff) | |
| download | ffmpeg-9034001b17077e9da5205c4344eb1b88b9882f03.tar.gz | |
h264 fill_filter_caches: Dont init chroma nnz_cache.
Found-by: Dark Shikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 02152ad621..d40ce0d049 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]; |