summaryrefslogtreecommitdiff
path: root/libavcodec/vp9_mc_template.c
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-12 23:45:52 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-13 12:38:15 +0100
commit7112b56a3413b68261e3db0314343e26c75be83b (patch)
tree01937a0a3d3fa86b14dc1b71bef16f4f4e272c89 /libavcodec/vp9_mc_template.c
parent0539ff0e1b2f4e388bf4de16d00846ed5cebe811 (diff)
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 <rsbultje@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavcodec/vp9_mc_template.c')
-rw-r--r--libavcodec/vp9_mc_template.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vp9_mc_template.c b/libavcodec/vp9_mc_template.c
index 38d9a6da9f..e7f226ca90 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