diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-11 22:38:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-11 22:53:28 +0200 |
| commit | 2cf4d91cf2219e00075e9feda64edbc1231e855e (patch) | |
| tree | baa64a80f6e6df6e2b799e911a5eaf7dd54b2e48 | |
| parent | 67911cc57bbe2958fe62ca092b0e43438cd0ba52 (diff) | |
| parent | cd62c04d009b3baf7582556866a7029291b54573 (diff) | |
| download | ffmpeg-2cf4d91cf2219e00075e9feda64edbc1231e855e.tar.gz | |
Merge commit 'cd62c04d009b3baf7582556866a7029291b54573'
* commit 'cd62c04d009b3baf7582556866a7029291b54573':
h263enc: keep block_last_index always valid during advanced intra coding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ituh263enc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 5db3a7512a..8b34fe4045 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -566,10 +566,6 @@ void ff_h263_encode_mb(MpegEncContext * s, else 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 (level < -127) level = -127; @@ -592,7 +588,9 @@ void ff_h263_encode_mb(MpegEncContext * s, /* Update AC/DC tables */ *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); } }else{ |