diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 14:38:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 15:22:11 +0200 |
| commit | 581b5f0b9b93969712e73e0ae6324bbd03e85d4e (patch) | |
| tree | d1319dc7744ac67e6ebd3379f11ff6e4a8178dc1 /libavcodec/h263.c | |
| parent | 909f53f2b285bc7dbe77d4690a03f3d114417297 (diff) | |
| parent | e3fcb14347466095839c2a3c47ebecff02da891e (diff) | |
| download | ffmpeg-581b5f0b9b93969712e73e0ae6324bbd03e85d4e.tar.gz | |
Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
dsputil: Split off IDCT bits into their own context
Conflicts:
configure
libavcodec/aic.c
libavcodec/arm/Makefile
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/asvdec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dvdec.c
libavcodec/dxva2_mpeg2.c
libavcodec/intrax8.c
libavcodec/mdec.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc_common.h
libavcodec/mpegvideo.c
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263.c')
| -rw-r--r-- | libavcodec/h263.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 77d5f75d56..b08e32e863 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -267,7 +267,7 @@ void ff_h263_pred_acdc(MpegEncContext * s, int16_t *block, int n) if (a != 1024) { ac_val -= 16; for(i=1;i<8;i++) { - block[s->dsp.idct_permutation[i<<3]] += ac_val[i]; + block[s->idsp.idct_permutation[i << 3]] += ac_val[i]; } pred_dc = a; } @@ -276,7 +276,7 @@ void ff_h263_pred_acdc(MpegEncContext * s, int16_t *block, int n) if (c != 1024) { ac_val -= 16 * wrap; for(i=1;i<8;i++) { - block[s->dsp.idct_permutation[i ]] += ac_val[i + 8]; + block[s->idsp.idct_permutation[i]] += ac_val[i + 8]; } pred_dc = c; } @@ -304,10 +304,10 @@ void ff_h263_pred_acdc(MpegEncContext * s, int16_t *block, int n) /* left copy */ for(i=1;i<8;i++) - ac_val1[i ] = block[s->dsp.idct_permutation[i<<3]]; + ac_val1[i] = block[s->idsp.idct_permutation[i << 3]]; /* top copy */ for(i=1;i<8;i++) - ac_val1[8 + i] = block[s->dsp.idct_permutation[i ]]; + ac_val1[8 + i] = block[s->idsp.idct_permutation[i]]; } int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir, |