summaryrefslogtreecommitdiff
path: root/libavcodec/g2meet.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-15 16:33:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-15 16:33:27 +0200
commit821a5938d100458f4d09d634041b05c860554ce0 (patch)
tree522db96fe847f86437b98a97c0ff38a1eb733961 /libavcodec/g2meet.c
parente428632c1a46430f0796e3f9f7d72234d18f1f04 (diff)
avcodec/g2meet: Fix order of align and pixel size multiplication.
Fixes out of array accesses Fixes Ticket2922 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g2meet.c')
-rw-r--r--libavcodec/g2meet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 9a228b8873..ccccf21834 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -453,7 +453,7 @@ static int g2m_init_buffers(G2MContext *c)
if (!c->synth_tile || !c->jpeg_tile ||
c->old_tile_w < c->tile_width ||
c->old_tile_h < c->tile_height) {
- c->tile_stride = FFALIGN(c->tile_width * 3, 16);
+ c->tile_stride = FFALIGN(c->tile_width, 16) * 3;
aligned_height = FFALIGN(c->tile_height, 16);
av_free(c->synth_tile);
av_free(c->jpeg_tile);