Merge commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914'

[ffmpeg] / libavcodec / vc1_block.c

diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c
index 676da53e994312f4e07599ab5c9c99d1f35ad9a3..96d2a9b9913801a4c57c6845845bf82a604dfeea 100644 (file)
--- a/libavcodec/vc1_block.c
+++ b/libavcodec/vc1_block.c
@@ -2931,9 +2931,10 @@ void ff_vc1_decode_blocks(VC1Context *v)
 
     v->s.esc3_level_length = 0;
     if (v->x8_type) {
-        ff_intrax8_decode_picture(&v->x8, &v->s.current_picture, &v->s.gb,
+        ff_intrax8_decode_picture(&v->x8, &v->s.current_picture,
+                                  &v->s.gb, &v->s.mb_x, &v->s.mb_y,
                                   2 * v->pq + v->halfpq, v->pq * !v->pquantizer,
-                                  v->s.loop_filter);
+                                  v->s.loop_filter, v->s.low_delay);
 
         ff_er_add_slice(&v->s.er, 0, 0,
                         (v->s.mb_x >> 1) - 1, (v->s.mb_y >> 1) - 1,