aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-04 14:47:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-04 15:08:37 +0100
commit70ff376e8357cd7af909e970d35b04e6ce6833cd (patch)
tree8947441d1f8b520717426265a37fd630ed45784f
parent49dd89f9027f3def12e170bb7d986d37812eedba (diff)
downloadffmpeg-70ff376e8357cd7af909e970d35b04e6ce6833cd.tar.gz
avformat/mpc8: Use uint64_t in *_get_v() to avoid undefined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 05e161952954acf247e0fd1fdef00559675c4d4d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/mpc8.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c
index 56db8076e5..804506fedc 100644
--- a/libavformat/mpc8.c
+++ b/libavformat/mpc8.c
@@ -57,7 +57,7 @@ typedef struct {
static inline int64_t bs_get_v(const uint8_t **bs)
{
- int64_t v = 0;
+ uint64_t v = 0;
int br = 0;
int c;
@@ -108,7 +108,7 @@ static int mpc8_probe(AVProbeData *p)
static inline int64_t gb_get_v(GetBitContext *gb)
{
- int64_t v = 0;
+ uint64_t v = 0;
int bits = 0;
while(get_bits1(gb) && bits < 64-7){
v <<= 7;