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.h | |
| 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.h')
| -rw-r--r-- | libavcodec/intrax8.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 849e04d952..ac31a5f16d 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -45,6 +45,7 @@ typedef struct IntraX8Context { int quant; int dquant; int qsum; + int loopfilter; // calculated per frame int quant_dc_chroma; @@ -81,7 +82,7 @@ void ff_intrax8_common_end(IntraX8Context *w); /** * Decode single IntraX8 frame. - * The parent codec must fill s->loopfilter and s->gb (bitstream). + * The parent codec must fill s->gb (bitstream). * The parent codec must call ff_mpv_frame_start() before calling this function. * The parent codec must call ff_mpv_frame_end() after calling this function. * This function does not use ff_mpv_decode_mb(). @@ -89,7 +90,9 @@ void ff_intrax8_common_end(IntraX8Context *w); * @param w pointer to IntraX8Context * @param dquant doubled quantizer, it would be odd in case of VC-1 halfpq==1. * @param quant_offset offset away from zero + * @param loopfilter enable filter after decoding a block */ -int ff_intrax8_decode_picture(IntraX8Context *w, int quant, int halfpq); +int ff_intrax8_decode_picture(IntraX8Context *w, int quant, int halfpq, + int loopfilter); #endif /* AVCODEC_INTRAX8_H */ |