summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-16 02:06:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-16 03:13:27 +0200
commita071c0b515e5935b4e2d09899303f6d3c9fb158b (patch)
treecee1186780e7868449e37724174686123247e4e9 /libavcodec
parent30aeab29e468926599e953235a75f84c50bdb499 (diff)
avcodec/utils: Fix undefined behavior in avpriv_toupper4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a06ded30c8..94df4b7855 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3454,7 +3454,7 @@ unsigned int avpriv_toupper4(unsigned int x)
return av_toupper(x & 0xFF) +
(av_toupper((x >> 8) & 0xFF) << 8) +
(av_toupper((x >> 16) & 0xFF) << 16) +
- (av_toupper((x >> 24) & 0xFF) << 24);
+((unsigned)av_toupper((x >> 24) & 0xFF) << 24);
}
int ff_thread_ref_frame(ThreadFrame *dst, ThreadFrame *src)