diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 20:58:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 21:05:12 +0200 |
| commit | db8ae37a783aba18d8f869dae1824a3e3f984bf8 (patch) | |
| tree | 280cfe9fdd15922660e34052e0dce0e93ab335c5 /libavcodec/intrax8.c | |
| parent | 34d278f9838e355b3b2c7a9c0f77d7fcaf37ce49 (diff) | |
| parent | da0c8664b4dc906696803685f7e53ade68594ab8 (diff) | |
Merge commit 'da0c8664b4dc906696803685f7e53ade68594ab8'
* commit 'da0c8664b4dc906696803685f7e53ade68594ab8':
mpegvideo: Move various temporary buffers to a separate context
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/rv34.c
libavcodec/vc1_mc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 017536d644..cf01289fdf 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -303,7 +303,7 @@ static int x8_setup_spatial_predictor(IntraX8Context * const w, const int chroma int sum; int quant; - w->dsp.setup_spatial_compensation(s->dest[chroma], s->edge_emu_buffer, + w->dsp.setup_spatial_compensation(s->dest[chroma], s->sc.edge_emu_buffer, s->current_picture.f->linesize[chroma>0], &range, &sum, w->edges); if(chroma){ @@ -639,7 +639,7 @@ static int x8_decode_intra_mb(IntraX8Context* const w, const int chroma){ if(w->flat_dc){ dsp_x8_put_solidcolor(w->predicted_dc, s->dest[chroma], s->current_picture.f->linesize[!!chroma]); }else{ - w->dsp.spatial_compensation[w->orient]( s->edge_emu_buffer, + w->dsp.spatial_compensation[w->orient]( s->sc.edge_emu_buffer, s->dest[chroma], s->current_picture.f->linesize[!!chroma] ); } |