diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-01-26 22:35:56 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-30 03:41:01 +0100 |
| commit | d23e3e5fea78420fecacbe3719e8d7928b591504 (patch) | |
| tree | 25a084528b21a442ca64e7d64b537f06f1fd172d /libavcodec/cavs.c | |
| parent | efcc10645525e7b5c2f3d7d46ecf6b5d267867f5 (diff) | |
| download | ffmpeg-d23e3e5fea78420fecacbe3719e8d7928b591504.tar.gz | |
Move ff_emulated_edge_mc() into DSPContext.
(cherry picked from commit 2e279598793133ee9c57fd0026d672f076fde4bf)
Diffstat (limited to 'libavcodec/cavs.c')
| -rw-r--r-- | libavcodec/cavs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 3958cf8093..db49ef3e67 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -353,7 +353,7 @@ static inline void mc_dir_part(AVSContext *h,Picture *pic,int square, || full_my < 0-extra_height || full_mx + 16/*FIXME*/ > pic_width + extra_width || full_my + 16/*FIXME*/ > pic_height + extra_height){ - ff_emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*h->l_stride, h->l_stride, + s->dsp.emulated_edge_mc(s->edge_emu_buffer, src_y - 2 - 2*h->l_stride, h->l_stride, 16+5, 16+5/*FIXME*/, full_mx-2, full_my-2, pic_width, pic_height); src_y= s->edge_emu_buffer + 2 + 2*h->l_stride; emu=1; @@ -365,14 +365,14 @@ static inline void mc_dir_part(AVSContext *h,Picture *pic,int square, } if(emu){ - ff_emulated_edge_mc(s->edge_emu_buffer, src_cb, h->c_stride, + s->dsp.emulated_edge_mc(s->edge_emu_buffer, src_cb, h->c_stride, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); src_cb= s->edge_emu_buffer; } chroma_op(dest_cb, src_cb, h->c_stride, chroma_height, mx&7, my&7); if(emu){ - ff_emulated_edge_mc(s->edge_emu_buffer, src_cr, h->c_stride, + s->dsp.emulated_edge_mc(s->edge_emu_buffer, src_cr, h->c_stride, 9, 9/*FIXME*/, (mx>>3), (my>>3), pic_width>>1, pic_height>>1); src_cr= s->edge_emu_buffer; } |