diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-04-29 08:00:03 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-05-01 09:24:18 +0200 |
| commit | a2941c8cb216bdc144953cace64973f5600ffa2d (patch) | |
| tree | debc8a02c1758e32cf1cd061fe3cc5d533b85f47 /libavcodec/motion_est_template.c | |
| parent | 6484149158b6fc6d13d2b2ef84cb26a2d3275400 (diff) | |
| download | ffmpeg-a2941c8cb216bdc144953cace64973f5600ffa2d.tar.gz | |
lavc: move CODEC_FLAG_MV0 to mpegvideo
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 3848ad4b27..575dadd269 100644 --- a/libavcodec/motion_est_template.c +++ b/libavcodec/motion_est_template.c @@ -896,7 +896,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 */ |