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.c | |
| 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.c')
| -rw-r--r-- | libavcodec/intrax8.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 9141c5bb7a..471009e61a 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -488,7 +488,7 @@ static void x8_ac_compensation(IntraX8Context *const w, const int direction, { MpegEncContext *const s = w->s; int t; -#define B(x,y) s->block[0][w->idct_permutation[(x)+(y)*8]] +#define B(x,y) s->block[0][w->idct_permutation[(x) + (y) * 8]] #define T(x) ((x) * dc_level + 0x8000) >> 16; switch (direction) { case 0: @@ -739,12 +739,14 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame, int mb_y) w->dest[2] += (mb_y & (~1)) * uvlinesize << 2; } -av_cold int ff_intrax8_common_init(IntraX8Context *w, MpegEncContext *const s) +av_cold int ff_intrax8_common_init(IntraX8Context *w, IDCTDSPContext *idsp, + MpegEncContext *const s) { int ret = x8_vlc_init(); if (ret < 0) return ret; + w->idsp = *idsp; w->s = s; //two rows, 2 blocks per cannon mb |