diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-12-22 23:30:57 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-12-22 23:30:57 +0000 |
| commit | d951bb9a5c4ff8e45ade4a1413e0aa5f3b73c5a3 (patch) | |
| tree | 94af5eaa5db2d7941593dbe8a4df0544f14ffed2 /libavcodec/motion_est_template.c | |
| parent | 79cc11b3ec19cfa63553467015e6cbdb7895a603 (diff) | |
| download | ffmpeg-d951bb9a5c4ff8e45ade4a1413e0aa5f3b73c5a3.tar.gz | |
test DIRECT{0,0} too if flag mv0 is used
slight PSNR/bitrate increase
Originally committed as revision 7361 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est_template.c')
| -rw-r--r-- | libavcodec/motion_est_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 1bfda10472..897c08e3df 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -1025,7 +1025,7 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int score_map[0]= dmin; //FIXME precalc first term below? - if((s->pict_type == B_TYPE || s->flags&CODEC_FLAG_MV0) && !(c->flags & FLAG_DIRECT)) + if((s->pict_type == B_TYPE && !(c->flags & FLAG_DIRECT)) || s->flags&CODEC_FLAG_MV0) dmin += (mv_penalty[pred_x] + mv_penalty[pred_y])*penalty_factor; /* first line */ |