diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:32:38 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:32:38 +0100 |
| commit | 36dad146935a500ef6fd7246b5c216f7af26f9db (patch) | |
| tree | 71c6109c6cda64b9a2655d3d5952806fe352c5b2 /libavcodec/vc1_block.c | |
| parent | e5c655b09817da9388a8812b93e9948c44cc00af (diff) | |
| parent | eaeba6f241e0de0e797be10f8fda967ef8489e64 (diff) | |
| download | ffmpeg-36dad146935a500ef6fd7246b5c216f7af26f9db.tar.gz | |
Merge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'
* commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64':
intrax8: Pass the output frame to the decoding function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/vc1_block.c')
| -rw-r--r-- | libavcodec/vc1_block.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 3853251527..50c50c2cc6 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -2931,8 +2931,9 @@ void ff_vc1_decode_blocks(VC1Context *v) v->s.esc3_level_length = 0; if (v->x8_type) { - ff_intrax8_decode_picture(&v->x8, 2 * v->pq + v->halfpq, - v->pq * !v->pquantizer, v->s.loop_filter); + ff_intrax8_decode_picture(&v->x8, &v->s.current_picture, + 2 * v->pq + v->halfpq, v->pq * !v->pquantizer, + v->s.loop_filter); ff_er_add_slice(&v->s.er, 0, 0, (v->s.mb_x >> 1) - 1, (v->s.mb_y >> 1) - 1, |