1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

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.
This commit is contained in:
Ronald S. Bultje 2015-09-14 14:50:47 -04:00
parent 0edf6c8b2a
commit a0d8a81075

View File

@ -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);