diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:19:53 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:19:53 +0100 |
commit | 83e0b1b1d7b4120f1bdd2576e977a6bda0283ce9 (patch) | |
tree | afb7cd771ff1dc58cad725e4e4f8bd7266586f05 /libavcodec/intrax8.h | |
parent | 627115b3e43f21023ff04c51de1fdfcd7296bbb1 (diff) | |
parent | 68127e1bf8037a6e0acd6401cc8c5da950e3fa0a (diff) |
Merge commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a'
* commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a':
intrax8: Keep a reference to the context idctdsp
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8.h')
-rw-r--r-- | libavcodec/intrax8.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index fdbcdec59a..849e04d952 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -21,6 +21,7 @@ #include "get_bits.h" #include "mpegvideo.h" +#include "idctdsp.h" #include "intrax8dsp.h" #include "wmv2dsp.h" @@ -40,6 +41,7 @@ typedef struct IntraX8Context { //set by the caller codec MpegEncContext * s; IntraX8DSPContext dsp; + IDCTDSPContext idsp; int quant; int dquant; int qsum; @@ -64,10 +66,12 @@ typedef struct IntraX8Context { * Initialize IntraX8 frame decoder. * Requires valid MpegEncContext with valid s->mb_width before calling. * @param w pointer to IntraX8Context + * @param idsp pointer to IDCTDSPContext * @param s pointer to MpegEncContext of the parent codec * @return 0 on success, a negative AVERROR value on error */ -int ff_intrax8_common_init(IntraX8Context *w, MpegEncContext *const s); +int ff_intrax8_common_init(IntraX8Context *w, IDCTDSPContext *idsp, + MpegEncContext *const s); /** * Destroy IntraX8 frame structure. |