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/intrax8.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/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 471009e61a..d8bcad663b 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -708,7 +708,7 @@ block_placed: if (!chroma) x8_update_predictions(w, w->orient, n); - if (s->loop_filter) { + if (w->loopfilter) { uint8_t *ptr = w->dest[chroma]; int linesize = s->current_picture.f->linesize[!!chroma]; @@ -777,7 +777,7 @@ av_cold void ff_intrax8_common_end(IntraX8Context *w) } int ff_intrax8_decode_picture(IntraX8Context *const w, int dquant, - int quant_offset) + int quant_offset, int loopfilter) { MpegEncContext *const s = w->s; int mb_xy; @@ -786,6 +786,7 @@ int ff_intrax8_decode_picture(IntraX8Context *const w, int dquant, w->dquant = dquant; w->quant = dquant >> 1; w->qsum = quant_offset; + w->loopfilter = loopfilter; w->divide_quant_dc_luma = ((1 << 16) + (w->quant >> 1)) / w->quant; if (w->quant < 5) { |