On 13.11.2016 03:22, Ronald S. Bultje wrote: > Hi Andreas, > > On Nov 12, 2016 5:52 PM, "Andreas Cadhalpun" > <andreas.cadhal...@googlemail.com <mailto:andreas.cadhal...@googlemail.com>> > wrote: >> >> The handling of the other block sizes was disabled for 'SCALED == 0' in >> commit dc96c0f9fc96bf4167633befc074394062793322, so this assert should >> be disabled, too, as it can now be triggered. >> >> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com >> <mailto:andreas.cadhal...@googlemail.com>> >> --- >> >> At least that would be the easy fix, but I'd be glad if Ronald could >> comment on this. >> >> --- >> 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 > > I think you're right, thanks for finding this.
Pushed after fixing the commit message: the assert is limited to SCALED == 0, not disabled for it. Best regards, Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
