diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-12-17 20:00:48 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-12-17 20:00:48 +0000 |
| commit | 6c3fca647983a2bb47a79c82a9d797feac866a2f (patch) | |
| tree | fbb8d74510db1c7d56c4e8ee6ce4d1de81da7aeb /libavcodec/rv34.c | |
| parent | 26bc319c1d358f32587a9938db0a4a97d26206b7 (diff) | |
Merge deblocking pattern with CBP for RV30/40 loop filtering
Originally committed as revision 16192 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index feffa343ad..da0e5f4c03 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1151,9 +1151,9 @@ static int rv34_decode_macroblock(RV34DecContext *r, int8_t *intra_types) r->cbp_luma [s->mb_x + s->mb_y * s->mb_stride] = cbp; r->cbp_chroma[s->mb_x + s->mb_y * s->mb_stride] = cbp >> 16; if(s->pict_type == FF_I_TYPE) - r->deblock_coefs[mb_pos] = 0; + r->deblock_coefs[mb_pos] = 0xFFFF; else - r->deblock_coefs[mb_pos] = rv34_set_deblock_coef(r); + r->deblock_coefs[mb_pos] = rv34_set_deblock_coef(r) | r->cbp_luma[mb_pos]; s->current_picture_ptr->qscale_table[s->mb_x + s->mb_y * s->mb_stride] = s->qscale; if(cbp == -1) |