Commit cd62c04d authored by Janne Grunau's avatar Janne Grunau

h263enc: keep block_last_index always valid during advanced intra coding

Prevents a triggered assert during fate-vsynth{1,2}-rv20 in
dct_unquantize_h263_intra_c().
parent 0ddc53da
...@@ -566,10 +566,6 @@ void ff_h263_encode_mb(MpegEncContext * s, ...@@ -566,10 +566,6 @@ void ff_h263_encode_mb(MpegEncContext * s,
else else
level = (level - (scale>>1))/scale; level = (level - (scale>>1))/scale;
/* AIC can change CBP */
if (level == 0 && s->block_last_index[i] == 0)
s->block_last_index[i] = -1;
if(!s->modified_quant){ if(!s->modified_quant){
if (level < -127) if (level < -127)
level = -127; level = -127;
...@@ -592,7 +588,9 @@ void ff_h263_encode_mb(MpegEncContext * s, ...@@ -592,7 +588,9 @@ void ff_h263_encode_mb(MpegEncContext * s,
/* Update AC/DC tables */ /* Update AC/DC tables */
*dc_ptr[i] = rec_intradc[i]; *dc_ptr[i] = rec_intradc[i];
if (s->block_last_index[i] >= 0) /* AIC can change CBP */
if (s->block_last_index[i] > 0 ||
(s->block_last_index[i] == 0 && level !=0))
cbp |= 1 << (5 - i); cbp |= 1 << (5 - i);
} }
}else{ }else{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment