aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-06-24 13:45:35 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-25 02:48:01 +0200
commit8b9e522e08d91d06dae059a844c2bf20c696a078 (patch)
tree7d0c1d2d6414aa362d2b1297d2c2207ef089df98
parentbb02e5bc09186e20f98d90e32311fd514c69ac56 (diff)
downloadffmpeg-8b9e522e08d91d06dae059a844c2bf20c696a078.tar.gz
avcodec/mpeg4videodec: Fix GMC with videos of dimension 1
Fixes: runtime error: shift exponent -1 is negative Fixes: 2338/clusterfuzz-testcase-minimized-5153426541379584 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 4976a3411f71518d17a57e373b62517f066648fd) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mpeg4videodec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 24bff114dd..d4c24c398e 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -171,7 +171,7 @@ static int mpeg4_decode_sprite_trajectory(Mpeg4DecContext *ctx, GetBitContext *g
int a = 2 << s->sprite_warping_accuracy;
int rho = 3 - s->sprite_warping_accuracy;
int r = 16 / a;
- int alpha = 0;
+ int alpha = 1;
int beta = 0;
int w = s->width;
int h = s->height;