diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:34:58 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:34:58 +0100 |
| commit | 52692eed615cc6dd05edae5505044401059408a0 (patch) | |
| tree | 90f11cee3af67ac92a3bb963d3b544b58c2f113d /libavcodec/intrax8.c | |
| parent | 50fa5715bcc3e63143e8ae8d1ef57d9e0e6a6325 (diff) | |
| parent | 1eaae7abb8f208fefb4e8b9e983e61b2499206a3 (diff) | |
| download | ffmpeg-52692eed615cc6dd05edae5505044401059408a0.tar.gz | |
Merge commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3'
* commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3':
intrax8: Reference the current AVCodecContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 9d3390cec4..a4aaad6ef0 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -733,13 +733,15 @@ 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, IDCTDSPContext *idsp, +av_cold int ff_intrax8_common_init(AVCodecContext *avctx, + IntraX8Context *w, IDCTDSPContext *idsp, MpegEncContext *const s) { int ret = x8_vlc_init(); if (ret < 0) return ret; + w->avctx = avctx; w->idsp = *idsp; w->s = s; |