aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-10-09 20:38:01 +0100
committerReinhard Tartler <siretart@tauware.de>2012-03-18 17:50:36 +0100
commitf9d17e6f54bad7a3fa287882dad7780b188b59bf (patch)
tree952727f8a0ced3c7c814bede5c9a73a4b31f26c6
parent0b1ac7bf4f8d091e03736decc7f8ac0357e80e5c (diff)
downloadffmpeg-f9d17e6f54bad7a3fa287882dad7780b188b59bf.tar.gz
4xm: fix signed overflow
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 84dda407628e298f33d610e9e04a8b2945d24665) Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavcodec/4xm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index ed832598b0..b0b01631c2 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -277,7 +277,7 @@ static void init_mv(FourXContext *f){
}
#endif
-static inline void mcdc(uint16_t *dst, uint16_t *src, int log2w, int h, int stride, int scale, int dc){
+static inline void mcdc(uint16_t *dst, uint16_t *src, int log2w, int h, int stride, int scale, unsigned dc){
int i;
dc*= 0x10001;