diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 17:03:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 17:03:59 +0200 |
| commit | e77b9853ea66ef6c34b04d121c5b3d1afaa33971 (patch) | |
| tree | d29ef557ca9f706269711b2a31663d956f237996 /libavcodec/motion_est_template.c | |
| parent | e40ae8cc00ae7e485a64a5b3b40b73dbfd32b631 (diff) | |
| parent | a2941c8cb216bdc144953cace64973f5600ffa2d (diff) | |
| download | ffmpeg-e77b9853ea66ef6c34b04d121c5b3d1afaa33971.tar.gz | |
Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'
* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
lavc: move CODEC_FLAG_MV0 to mpegvideo
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est_template.c')
| -rw-r--r-- | libavcodec/motion_est_template.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c index 2fa97aa8e2..53a39c0cbe 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -894,7 +894,8 @@ 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 == AV_PICTURE_TYPE_B && !(c->flags & FLAG_DIRECT)) || s->flags&CODEC_FLAG_MV0) + if ((s->pict_type == AV_PICTURE_TYPE_B && !(c->flags & FLAG_DIRECT)) || + s->mpv_flags & FF_MPV_FLAG_MV0) dmin += (mv_penalty[pred_x] + mv_penalty[pred_y])*penalty_factor; /* first line */ |