aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-09-14 14:50:47 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2015-09-15 09:20:34 -0400
commita0d8a81075c0d5119083df9a0cb0be094a4e0190 (patch)
treec3d9fdde9b1510bb3e626bc6491d38ae9ebd3198
parent0edf6c8b2a976d8af5d4211da565ca30b9759737 (diff)
downloadffmpeg-a0d8a81075c0d5119083df9a0cb0be094a4e0190.tar.gz
vp9: switch min_tile_cols location so it shifts up instead of down.
This fixes cases where the shifted number is 64, but we shifted non- zero numbers away in the shift. The change makes behaviour consistent with libvpx.
-rw-r--r--libavcodec/vp9.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index a357a5f559..f1183e8e75 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -823,7 +823,7 @@ static int decode_frame_header(AVCodecContext *ctx,
return res;
}
for (s->tiling.log2_tile_cols = 0;
- (s->sb_cols >> s->tiling.log2_tile_cols) > 64;
+ s->sb_cols > (64 << s->tiling.log2_tile_cols);
s->tiling.log2_tile_cols++) ;
for (max = 0; (s->sb_cols >> max) >= 4; max++) ;
max = FFMAX(0, max - 1);