diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:18:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:18:43 +0100 |
| commit | a41bf09d9c56215448f14fb086c9f882eb41ecac (patch) | |
| tree | 541da01619d95763ff0ee46ae0df50125505b3c4 /libavcodec/svq3.c | |
| parent | fb3f28ee289b9ea5106d5a7fa00a1018eb379e65 (diff) | |
| parent | 6906b19346ae8a330bfaa1c16ce535be10789723 (diff) | |
| download | ffmpeg-a41bf09d9c56215448f14fb086c9f882eb41ecac.tar.gz | |
Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'
* commit '6906b19346ae8a330bfaa1c16ce535be10789723':
lavc: add missing files for arm
lavc: introduce VideoDSPContext
Conflicts:
configure
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 46561a3516..c12c75f51b 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -297,9 +297,9 @@ static inline void svq3_mc_dir_part(MpegEncContext *s, src = pic->f.data[0] + mx + my * s->linesize; if (emu) { - s->dsp.emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, - width + 1, height + 1, - mx, my, s->h_edge_pos, s->v_edge_pos); + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, + width + 1, height + 1, + mx, my, s->h_edge_pos, s->v_edge_pos); src = s->edge_emu_buffer; } if (thirdpel) @@ -323,10 +323,10 @@ static inline void svq3_mc_dir_part(MpegEncContext *s, src = pic->f.data[i] + mx + my * s->uvlinesize; if (emu) { - s->dsp.emulated_edge_mc(s->edge_emu_buffer, src, s->uvlinesize, - width + 1, height + 1, - mx, my, (s->h_edge_pos >> 1), - s->v_edge_pos >> 1); + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src, s->uvlinesize, + width + 1, height + 1, + mx, my, (s->h_edge_pos >> 1), + s->v_edge_pos >> 1); src = s->edge_emu_buffer; } if (thirdpel) |