summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-04 14:47:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-12 18:03:49 +0100
commitd0a925ba2e7c299da93956a61b6a95a8c909e0f2 (patch)
tree943d42517910cf20f85ced7fff6c69606c836ac9
parente83c03aaf1477b9985c80669f824ef0534002a4e (diff)
downloadffmpeg-d0a925ba2e7c299da93956a61b6a95a8c909e0f2.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 6499fca79e..01fdcec2a6 100644
--- a/libavformat/mpc8.c
+++ b/libavformat/mpc8.c
@@ -55,7 +55,7 @@ typedef struct {
static inline int64_t bs_get_v(uint8_t **bs)
{
- int64_t v = 0;
+ uint64_t v = 0;
int br = 0;
int c;
@@ -106,7 +106,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;