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/intrax8.h | |
| parent | 578fb5a27d4523c958a1907787b659883a2d9b5b (diff) | |
| parent | b1268e0f032a3af3912fe3fb8d3855e12d7ea83b (diff) | |
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/intrax8.h')
| -rw-r--r-- | libavcodec/intrax8.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 2f54598a37..fd7225edca 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -105,12 +105,14 @@ void ff_intrax8_common_end(IntraX8Context *w); * @param w pointer to IntraX8Context * @param pict the output Picture containing an AVFrame * @param gb open bitstream reader + * @param mb_x pointer to the x coordinate of the current macroblock + * @param mb_y pointer to the y coordinate of the current macroblock * @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, Picture *pict, - GetBitContext *gb, + GetBitContext *gb, int *mb_x, int *mb_y, int quant, int halfpq, int loopfilter); #endif /* AVCODEC_INTRAX8_H */ |