aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/motion_est.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-09-13 09:45:32 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-09-13 09:45:32 +0000
commitbea669e57cdd72b22cfc51514493a90f62dc96c9 (patch)
tree8ff405b8a270501fa7a9827bb449bdf612d6ae62 /libavcodec/motion_est.c
parent1c73a3fbf27dd506207fa76943a0f360748e71ae (diff)
downloadffmpeg-bea669e57cdd72b22cfc51514493a90f62dc96c9.tar.gz
interlaced mpeg4 b frame decoding
Originally committed as revision 936 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est.c')
-rw-r--r--libavcodec/motion_est.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 325d0f5525..032556a6d4 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -1391,8 +1391,8 @@ static inline int direct_search(MpegEncContext * s,
const int motion_px= s->p_mv_table[mot_xy][0];
const int motion_py= s->p_mv_table[mot_xy][1];
const int time_pp= s->pp_time;
- const int time_bp= s->bp_time;
- const int time_pb= time_pp - time_bp;
+ const int time_pb= s->pb_time;
+ const int time_bp= time_pp - time_pb;
int bx, by;
int mx, my, mx2, my2;
uint8_t *ref_picture= s->me_scratchpad - (mb_x - 1 + (mb_y - 1)*s->linesize)*16;