diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:25:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:25:24 +0100 |
| commit | d1bbd304bf608c9ca5fe747a8ee317e4c4e0ecbe (patch) | |
| tree | cb34d55aa421569fd67f0819d56b21aeac348075 /libavcodec/motion_est.c | |
| parent | 3c8085dc4250a98405eb64b3765f4ceb8d177c00 (diff) | |
| parent | f81c37e40fe3236d54da12aef9cdba48ba70ec31 (diff) | |
Merge commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31'
* commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31':
vf_delogo: fix an uninitialized read.
h264: remove obsolete comment.
mpegvideo: remove some unused variables from Picture.
utvideoenc/v410enc: do not set AVFrame.reference.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 2c16c9ad22..ce61cab15b 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -1092,7 +1092,6 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, vard = s->dsp.sse[0](NULL, pix, ppix, s->linesize, 16); pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8; -// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin; c->mc_mb_var_sum_temp += (vard+128)>>8; if(mb_type){ @@ -1171,7 +1170,6 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, } } -// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin; set_p_mv_tables(s, mx, my, mb_type!=CANDIDATE_MB_TYPE_INTER4V); /* get intra luma score */ |