From beca9a286c46a67b39fde5fab62a60d0766fc5ad Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 10 Aug 2008 16:10:39 +0000
Subject: [PATCH] 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
Originally committed as revision 14683 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/h264.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a4e3339aa15..619b618765b 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -191,10 +191,10 @@ static void fill_caches(H264Context *h, int mb_type, int for_deblock){
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;
}
}
}
--
GitLab