diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 00:56:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 01:22:14 +0200 |
| commit | 2d5e9451de3c7ab00cac6ec4aff290e12a2f190d (patch) | |
| tree | 9934a09e3ad1f63796274ee59f216df19cd9ca02 /libavcodec/asvenc.c | |
| parent | 6cc1fec41263add956b35af96d7c4a81c9436a65 (diff) | |
| parent | f46bb608d9d76c543e4929dc8cffe36b84bd789e (diff) | |
| download | ffmpeg-2d5e9451de3c7ab00cac6ec4aff290e12a2f190d.tar.gz | |
Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'
* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
dsputil: Split off pixel block routines into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/pixblockdsp_template.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/asvenc.c')
| -rw-r--r-- | libavcodec/asvenc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index ae81953f30..02cf2db991 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -160,16 +160,16 @@ static inline void dct_get(ASV1Context *a, const AVFrame *frame, uint8_t *ptr_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8; uint8_t *ptr_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8; - a->dsp.get_pixels(block[0], ptr_y , linesize); - a->dsp.get_pixels(block[1], ptr_y + 8, linesize); - a->dsp.get_pixels(block[2], ptr_y + 8*linesize , linesize); - a->dsp.get_pixels(block[3], ptr_y + 8*linesize + 8, linesize); + a->pdsp.get_pixels(block[0], ptr_y, linesize); + a->pdsp.get_pixels(block[1], ptr_y + 8, linesize); + a->pdsp.get_pixels(block[2], ptr_y + 8 * linesize, linesize); + a->pdsp.get_pixels(block[3], ptr_y + 8 * linesize + 8, linesize); for(i=0; i<4; i++) a->fdsp.fdct(block[i]); if(!(a->avctx->flags&CODEC_FLAG_GRAY)){ - a->dsp.get_pixels(block[4], ptr_cb, frame->linesize[1]); - a->dsp.get_pixels(block[5], ptr_cr, frame->linesize[2]); + a->pdsp.get_pixels(block[4], ptr_cb, frame->linesize[1]); + a->pdsp.get_pixels(block[5], ptr_cr, frame->linesize[2]); for(i=4; i<6; i++) a->fdsp.fdct(block[i]); } @@ -282,8 +282,8 @@ static av_cold int encode_init(AVCodecContext *avctx){ const int scale= avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2; ff_asv_common_init(avctx); - ff_dsputil_init(&a->dsp, avctx); ff_fdctdsp_init(&a->fdsp, avctx); + ff_pixblockdsp_init(&a->pdsp, avctx); if(avctx->global_quality <= 0) avctx->global_quality= 4*FF_QUALITY_SCALE; |