aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/motion_est.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-10-09 20:18:34 +0100
committerMans Rullgard <mans@mansr.com>2011-10-11 12:05:50 +0100
commitcb668476ab1343d27e03edc0b32f57ca7a187471 (patch)
tree2832d7c298f62d51acd5360068d00880ceefc45c /libavcodec/motion_est.c
parent4c7a232fc81fdbdee279ab819a255f624a22b083 (diff)
downloadffmpeg-cb668476ab1343d27e03edc0b32f57ca7a187471.tar.gz
motion_est: make MotionExtContext.map_generation unsigned
The way this value is used, it should be an unsigned type. While the numerical value has no meaning, unsigned wraparound is relied upon. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/motion_est.c')
-rw-r--r--libavcodec/motion_est.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index d0f93673ac..c4512a91dd 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -52,7 +52,7 @@ static inline int sad_hpel_motion_search(MpegEncContext * s,
int src_index, int ref_index,
int size, int h);
-static inline int update_map_generation(MotionEstContext *c)
+static inline unsigned update_map_generation(MotionEstContext *c)
{
c->map_generation+= 1<<(ME_MAP_MV_BITS*2);
if(c->map_generation==0){