vp9_mc_template: limit assert to SCALED == 0
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Sat, 12 Nov 2016 22:45:52 +0000 (23:45 +0100)
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Sun, 13 Nov 2016 11:38:15 +0000 (12:38 +0100)
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 <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
libavcodec/vp9_mc_template.c

index 38d9a6d..e7f226c 100644 (file)
@@ -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