Merge commit '36b380dcd52ef47d7ba0559ed51192c88d82a9bd'

[ffmpeg] / libavcodec / vp9_mc_template.c

diff --git a/libavcodec/vp9_mc_template.c b/libavcodec/vp9_mc_template.c
index 38d9a6da9fa48fea74515666f85abc88e7630db3..e7f226ca90e82484ea173665947948520a519cc0 100644 (file)
--- 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