diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:36:46 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:36:54 +0100 |
| commit | 123fef54cc8fdadc70829ab12f587e4b64cdbc96 (patch) | |
| tree | a7e7fdb0590c0708b02cf6d3e3fee75685f5da4b /libavcodec/vc1_block.c | |
| parent | 578fb5a27d4523c958a1907787b659883a2d9b5b (diff) | |
| parent | b1268e0f032a3af3912fe3fb8d3855e12d7ea83b (diff) | |
| download | ffmpeg-123fef54cc8fdadc70829ab12f587e4b64cdbc96.tar.gz | |
Merge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b'
* commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b':
intrax8: Pass macroblock coordinates to ff_intrax8_decode_picture
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/vc1_block.c')
| -rw-r--r-- | libavcodec/vc1_block.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 676da53e99..552890392b 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -2931,7 +2931,8 @@ 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); |