diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:31:14 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:31:14 +0100 |
| commit | e5c655b09817da9388a8812b93e9948c44cc00af (patch) | |
| tree | 6a2407434cfaa99f084147e924bce0a5179304c4 /libavcodec/vc1_block.c | |
| parent | 83e0b1b1d7b4120f1bdd2576e977a6bda0283ce9 (diff) | |
| parent | 577393321c389ad2973bec6168a8045c94a9e099 (diff) | |
Merge commit '577393321c389ad2973bec6168a8045c94a9e099'
* commit '577393321c389ad2973bec6168a8045c94a9e099':
intrax8: Carry over the loopfilter value in 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 c74788b99c..3853251527 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, 2*v->pq + v->halfpq, v->pq * !v->pquantizer); + ff_intrax8_decode_picture(&v->x8, 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, |