# HG changeset patch # User michael # Date 1218384639 0 # Node ID 553ec99ac3b0750ecbc93c46e3795a94663afbe0 # Parent ebdac291453ad5b633e2fc424d8411e5e6fbae67 Mask bits of reference indexes properly to avoid negative numbers entangling each other. Fixes at least: CAMA1_TOSHIBA_B cama1_vtc_c CAMA3_Sand_E cama3_vtc_b CAMASL3_Sony_B CVMA1_TOSHIBA_B CVMAQP3_Sony_D cvmp_mot_mbaff0_full_B FRExt/HCAMFF1_HHI FRExt/HCHP3_HHI_A FRExt/HVLCMFF0_Sony_B diff -r ebdac291453a -r 553ec99ac3b0 h264.c --- a/h264.c Sun Aug 10 15:39:46 2008 +0000 +++ b/h264.c Sun Aug 10 16:10:39 2008 +0000 @@ -191,10 +191,10 @@ if(USES_LIST(mb_type,list)){ int8_t *ref = &s->current_picture.ref_index[list][h->mb2b8_xy[mb_xy]]; *(uint32_t*)&h->ref_cache[list][scan8[ 0]] = - *(uint32_t*)&h->ref_cache[list][scan8[ 2]] = pack16to32(ref[0],ref[1])*0x0101; + *(uint32_t*)&h->ref_cache[list][scan8[ 2]] = (pack16to32(ref[0],ref[1])&0x00FF00FF)*0x0101; ref += h->b8_stride; *(uint32_t*)&h->ref_cache[list][scan8[ 8]] = - *(uint32_t*)&h->ref_cache[list][scan8[10]] = pack16to32(ref[0],ref[1])*0x0101; + *(uint32_t*)&h->ref_cache[list][scan8[10]] = (pack16to32(ref[0],ref[1])&0x00FF00FF)*0x0101; } } }