ffmpeg | branch: master | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Sat Nov 12 23:45:52 2016 +0100| [7112b56a3413b68261e3db0314343e26c75be83b] | committer: Andreas Cadhalpun
vp9_mc_template: limit assert to SCALED == 0 The handling of the other block sizes was limited to 'SCALED == 0' in commit dc96c0f9fc96bf4167633befc074394062793322, so this assert should be disabled, too, as it can now be triggered. Reviewed-by: Ronald S. Bultje <rsbul...@gmail.com> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7112b56a3413b68261e3db0314343e26c75be83b --- libavcodec/vp9_mc_template.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/vp9_mc_template.c b/libavcodec/vp9_mc_template.c index 38d9a6d..e7f226c 100644 --- a/libavcodec/vp9_mc_template.c +++ b/libavcodec/vp9_mc_template.c @@ -205,7 +205,9 @@ static void FN(inter_pred)(AVCodecContext *ctx) } else #endif { +#if SCALED == 0 av_assert2(b->bs == BS_4x4); +#endif // FIXME if two horizontally adjacent blocks have the same MV, // do a w8 instead of a w4 call _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog