diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:54:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-18 13:54:38 +0100 |
| commit | 8ac0d95bd371a3cf6b4dd57a3d56cdc7bceef464 (patch) | |
| tree | 1cbdc131646a523249ebdd373387176c161e5928 /libavcodec/rv30.c | |
| parent | 17596198cacbb7277f1d9641f0a76fe62ebf155d (diff) | |
| parent | 940b8b5861241df7aff8977774e1de6e67de5b83 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: avoid pointless copying of ref lists
lavr: always reset mix function names and pointers in mix_function_init()
lavr: call mix_function_init() in ff_audio_mix_set_matrix()
fate: update ref after rv30_loop_filter fix
rv30: fix masking in rv30_loop_filter()
Conflicts:
tests/ref/fate/filter-delogo
tests/ref/fate/rv30
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv30.c')
| -rw-r--r-- | libavcodec/rv30.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 9d33051354..17f1e99726 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -187,7 +187,7 @@ static void rv30_loop_filter(RV34DecContext *r, int row) for(i = !mb_x; i < 2; i++, C += 4){ int ij = i + (j >> 1); loc_lim = 0; - if(cur_cbp && (1 << ij)) + if (cur_cbp & (1 << ij)) loc_lim = cur_lim; else if(!i && left_cbp & (1 << (ij + 1))) loc_lim = left_lim; @@ -229,7 +229,7 @@ static void rv30_loop_filter(RV34DecContext *r, int row) for(i = 0; i < 2; i++, C += 4){ int ij = i + (j >> 1); loc_lim = 0; - if(r->cbp_chroma[mb_pos] && (1 << ij)) + if (r->cbp_chroma[mb_pos] & (1 << ij)) loc_lim = cur_lim; else if(!j && top_cbp & (1 << (ij + 2))) loc_lim = top_lim; |