virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

lavc/motion_est: Fix undefined negative left shifts.

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2017-04-18 11:02:30 +02:00
parent 87071478b4
commit b6a8396245
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/motion_est.c
View File

@ -956,10 +956,10 @@ void ff_estimate_p_frame_motion(MpegEncContext * s,
P_TOPRIGHT[1] = s->current_picture.motion_val[0][mot_xy - mot_stride + 2][1];
if (P_TOP[1] > (c->ymax << shift))
P_TOP[1] = c->ymax << shift;
if (P_TOPRIGHT[0] < (c->xmin << shift))
P_TOPRIGHT[0] = c->xmin << shift;
if (P_TOPRIGHT[1] > (c->ymax << shift))
P_TOPRIGHT[1] = c->ymax << shift;
if (P_TOPRIGHT[0] < (c->xmin * (1 << shift)))
P_TOPRIGHT[0] = c->xmin * (1 << shift);
if (P_TOPRIGHT[1] > (c->ymax * (1 << shift)))
P_TOPRIGHT[1] = c->ymax * (1 << shift);
P_MEDIAN[0] = mid_pred(P_LEFT[0], P_TOP[0], P_TOPRIGHT[0]);
P_MEDIAN[1] = mid_pred(P_LEFT[1], P_TOP[1], P_TOPRIGHT[1]);