aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/intrax8.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-24 12:33:07 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-24 12:33:07 +0100
commit93c61c980d63101d7ea1664fd83c810e95ffdc06 (patch)
treefd63d0b176570bd6ddcbaf34294f1f01171a7bb4 /libavcodec/intrax8.c
parent36dad146935a500ef6fd7246b5c216f7af26f9db (diff)
parent65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0 (diff)
downloadffmpeg-93c61c980d63101d7ea1664fd83c810e95ffdc06.tar.gz
Merge commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0'
* commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0': intrax8: Use a constant buffer instead of a ScratchpadContext Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8.c')
-rw-r--r--libavcodec/intrax8.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index d3916992fc..2b37658cb7 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -326,12 +326,11 @@ static int x8_get_dc_rlf(IntraX8Context *const w, const int mode,
static int x8_setup_spatial_predictor(IntraX8Context *const w, const int chroma)
{
- MpegEncContext *const s = w->s;
int range;
int sum;
int quant;
- w->dsp.setup_spatial_compensation(w->dest[chroma], s->sc.edge_emu_buffer,
+ w->dsp.setup_spatial_compensation(w->dest[chroma], w->scratchpad,
w->frame->linesize[chroma > 0],
&range, &sum, w->edges);
if (chroma) {
@@ -695,7 +694,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma)
dsp_x8_put_solidcolor(w->predicted_dc, w->dest[chroma],
w->frame->linesize[!!chroma]);
} else {
- w->dsp.spatial_compensation[w->orient](s->sc.edge_emu_buffer,
+ w->dsp.spatial_compensation[w->orient](w->scratchpad,
w->dest[chroma],
w->frame->linesize[!!chroma]);
}