[FFmpeg-cvslog] vp9: switch min_tile_cols location so it shifts up instead of down.

Ronald S. Bultje git at videolan.org
Tue Sep 15 15:31:08 CEST 2015


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Mon Sep 14 14:50:47 2015 -0400| [a0d8a81075c0d5119083df9a0cb0be094a4e0190] | committer: Ronald S. Bultje

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0d8a81075c0d5119083df9a0cb0be094a4e0190
---

 libavcodec/vp9.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index a357a5f..f1183e8 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);



More information about the ffmpeg-cvslog mailing list