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.c | |
| parent | 6484149158b6fc6d13d2b2ef84cb26a2d3275400 (diff) | |
| download | ffmpeg-a2941c8cb216bdc144953cace64973f5600ffa2d.tar.gz | |
lavc: move CODEC_FLAG_MV0 to mpegvideo
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 6a4c3e63e9..ebc89173a1 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -973,7 +973,7 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, // if (varc*2 + 200*256 + 50*(s->lambda2>>FF_LAMBDA_SHIFT) > vard){ mb_type|= CANDIDATE_MB_TYPE_INTER; c->sub_motion_search(s, &mx, &my, dmin, 0, 0, 0, 16); - if(s->flags&CODEC_FLAG_MV0) + if (s->mpv_flags & FF_MPV_FLAG_MV0) if(mx || my) mb_type |= CANDIDATE_MB_TYPE_SKIPPED; //FIXME check difference }else{ @@ -1592,7 +1592,8 @@ void ff_estimate_b_frame_motion(MpegEncContext * s, } //FIXME something smarter if(dmin>256*256*16) type&= ~CANDIDATE_MB_TYPE_DIRECT; //do not try direct mode if it is invalid for this MB - if(s->codec_id == AV_CODEC_ID_MPEG4 && type&CANDIDATE_MB_TYPE_DIRECT && s->flags&CODEC_FLAG_MV0 && *(uint32_t*)s->b_direct_mv_table[xy]) + if (s->codec_id == AV_CODEC_ID_MPEG4 && type&CANDIDATE_MB_TYPE_DIRECT && + s->mpv_flags & FF_MPV_FLAG_MV0 && *(uint32_t*)s->b_direct_mv_table[xy]) type |= CANDIDATE_MB_TYPE_DIRECT0; } |