virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

Merge commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0'

Browse Source 
* commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0':
  intrax8: Use a constant buffer instead of a ScratchpadContext

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-24 12:33:07 +01:00
commit 93c61c980d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/intrax8.c
View File

@ -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]);
}

1
libavcodec/intrax8.h
View File

@ -54,6 +54,7 @@ typedef struct IntraX8Context {
int divide_quant_dc_luma;
int divide_quant_dc_chroma;
uint8_t *dest[3];
uint8_t scratchpad[42]; // size of the block is fixed (8x8 plus padding)
// changed per block
int edges;