mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'cd62c04d009b3baf7582556866a7029291b54573'
* commit 'cd62c04d009b3baf7582556866a7029291b54573': h263enc: keep block_last_index always valid during advanced intra coding Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
2cf4d91cf2
|
@ -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,
|
||||||
|
|
||||||
/* 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{
|
||||||
|
|
Loading…
Reference in New Issue