diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:35:20 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:35:20 +0100 |
commit | 578fb5a27d4523c958a1907787b659883a2d9b5b (patch) | |
tree | f6fdba3aec0a5072b005e848ca801ec34442632a /libavcodec/intrax8.h | |
parent | eee5a7cd7d150024ff74fc1ffa78ab5dfb06131c (diff) | |
parent | d0540fd02171a6233d2016b199d013299debf7e3 (diff) | |
download | ffmpeg-578fb5a27d4523c958a1907787b659883a2d9b5b.tar.gz |
Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'
* commit 'd0540fd02171a6233d2016b199d013299debf7e3':
intrax8: Pass macroblock size to ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8.h')
-rw-r--r-- | libavcodec/intrax8.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index ed3dcc661f..2f54598a37 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -68,6 +68,10 @@ typedef struct IntraX8Context { int chroma_orient; int orient; int est_run; + + // block props + int mb_x, mb_y; + int mb_width, mb_height; } IntraX8Context; /** @@ -76,11 +80,14 @@ typedef struct IntraX8Context { * @param avctx pointer to AVCodecContext * @param w pointer to IntraX8Context * @param idsp pointer to IDCTDSPContext + * @param mb_width macroblock width + * @param mb_height macroblock height * @param s pointer to MpegEncContext of the parent codec * @return 0 on success, a negative AVERROR value on error */ int ff_intrax8_common_init(AVCodecContext *avctx, IntraX8Context *w, IDCTDSPContext *idsp, + int mb_width, int mb_height, MpegEncContext *const s); /** |