H.264: fix bug in lossless 4:4:4 decoding
authorJason Garrett-Glaser <jason@x264.com>
Mon, 20 Jun 2011 22:56:35 +0000 (15:56 -0700)
committerReinhard Tartler <siretart@tauware.de>
Thu, 23 Jun 2011 07:13:55 +0000 (09:13 +0200)
Coefficient test for i16x16 add_pixels4 assumed luma plane.
(cherry picked from commit 3b79f2e2e928eb346dbea85cc89393dcdf010ca9)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavcodec/h264.c

index 13a6380..124f9a8 100644 (file)
@@ -1744,7 +1744,7 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, int mb_type,
                         h->hpc.pred16x16_add[h->intra16x16_pred_mode](dest_y, block_offset, h->mb + (p*256 << pixel_shift), linesize);
                     }else{
                         for(i=0; i<16; i++){
-                            if(h->non_zero_count_cache[ scan8[i+p*16] ] || dctcoef_get(h->mb, pixel_shift, i*16))
+                            if(h->non_zero_count_cache[ scan8[i+p*16] ] || dctcoef_get(h->mb, pixel_shift, i*16+p*256))
                                 s->dsp.add_pixels4(dest_y + block_offset[i], h->mb + (i*16+p*256 << pixel_shift), linesize);
                         }
                     }