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/rv34.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/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index a232ab2593..c109a9e003 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -726,12 +726,12 @@ static inline void rv34_mc(RV34DecContext *r, const int block_type, (unsigned)(src_x - !!lx*2) > s->h_edge_pos - !!lx*2 - (width <<3) - 4 || (unsigned)(src_y - !!ly*2) > s->v_edge_pos - !!ly*2 - (height<<3) - 4) { srcY -= 2 + 2*s->linesize; - s->vdsp.emulated_edge_mc(s->edge_emu_buffer, srcY, + s->vdsp.emulated_edge_mc(s->sc.edge_emu_buffer, srcY, s->linesize, s->linesize, (width << 3) + 6, (height << 3) + 6, src_x - 2, src_y - 2, s->h_edge_pos, s->v_edge_pos); - srcY = s->edge_emu_buffer + 2 + 2*s->linesize; + srcY = s->sc.edge_emu_buffer + 2 + 2*s->linesize; emu = 1; } if(!weighted){ @@ -756,7 +756,7 @@ static inline void rv34_mc(RV34DecContext *r, const int block_type, is16x16 = (block_type != RV34_MB_P_8x8) && (block_type != RV34_MB_P_16x8) && (block_type != RV34_MB_P_8x16); qpel_mc[!is16x16][dxy](Y, srcY, s->linesize); if (emu) { - uint8_t *uvbuf = s->edge_emu_buffer; + uint8_t *uvbuf = s->sc.edge_emu_buffer; s->vdsp.emulated_edge_mc(uvbuf, srcU, s->uvlinesize, s->uvlinesize, |