diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2006-01-09 03:38:37 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2006-01-09 03:38:37 +0000 |
| commit | e8b562087db87a426aa895d6c3664bc26949eb54 (patch) | |
| tree | 479e1e923e3185fe7f5c9f1d70c3429091cf1dd3 /libavcodec/h264.c | |
| parent | 70abb4075954c1323dc0fb81e51c46faceef1e4c (diff) | |
| download | ffmpeg-e8b562087db87a426aa895d6c3664bc26949eb54.tar.gz | |
tweak h264_biweight
Originally committed as revision 4835 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index bf6307dd2e..3ce31c92e5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2709,19 +2709,19 @@ static inline void mc_part_weighted(H264Context *h, int n, int square, int chrom if(h->use_weight == 2){ int weight0 = h->implicit_weight[refn0][refn1]; int weight1 = 64 - weight0; - luma_weight_avg( dest_y, tmp_y, s-> linesize, 5, weight0, weight1, 0, 0); - chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, 5, weight0, weight1, 0, 0); - chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, 5, weight0, weight1, 0, 0); + luma_weight_avg( dest_y, tmp_y, s-> linesize, 5, weight0, weight1, 0); + chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, 5, weight0, weight1, 0); + chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, 5, weight0, weight1, 0); }else{ luma_weight_avg(dest_y, tmp_y, s->linesize, h->luma_log2_weight_denom, h->luma_weight[0][refn0], h->luma_weight[1][refn1], - h->luma_offset[0][refn0], h->luma_offset[1][refn1]); + h->luma_offset[0][refn0] + h->luma_offset[1][refn1]); chroma_weight_avg(dest_cb, tmp_cb, s->uvlinesize, h->chroma_log2_weight_denom, h->chroma_weight[0][refn0][0], h->chroma_weight[1][refn1][0], - h->chroma_offset[0][refn0][0], h->chroma_offset[1][refn1][0]); + h->chroma_offset[0][refn0][0] + h->chroma_offset[1][refn1][0]); chroma_weight_avg(dest_cr, tmp_cr, s->uvlinesize, h->chroma_log2_weight_denom, h->chroma_weight[0][refn0][1], h->chroma_weight[1][refn1][1], - h->chroma_offset[0][refn0][1], h->chroma_offset[1][refn1][1]); + h->chroma_offset[0][refn0][1] + h->chroma_offset[1][refn1][1]); } }else{ int list = list1 ? 1 : 0; |