diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-11-12 18:49:36 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-11-12 18:49:36 +0000 |
| commit | 36cd3069073f78907b8ad3fd12c5faf8070a5cc6 (patch) | |
| tree | e841339216fd846fd8ddb337b091349c1b9f704e /libavcodec | |
| parent | 7e2447028cc9ba184e2be530288ddd1ee959a852 (diff) | |
| download | ffmpeg-36cd3069073f78907b8ad3fd12c5faf8070a5cc6.tar.gz | |
rename inverse -> ff_inverse
Originally committed as revision 6990 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dsputil.c | 2 | ||||
| -rw-r--r-- | libavcodec/i386/mpegvideo_mmx_template.c | 2 | ||||
| -rw-r--r-- | libavcodec/msmpeg4.c | 2 | ||||
| -rw-r--r-- | libavcodec/vorbis.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 56c42b98ac..82d5dde65e 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -93,7 +93,7 @@ const uint8_t ff_alternate_vertical_scan[64] = { }; /* a*inverse[b]>>32 == a/b for all 0<=a<=65536 && 2<=b<=255 */ -const uint32_t inverse[256]={ +const uint32_t ff_inverse[256]={ 0, 4294967295U,2147483648U,1431655766, 1073741824, 858993460, 715827883, 613566757, 536870912, 477218589, 429496730, 390451573, 357913942, 330382100, 306783379, 286331154, 268435456, 252645136, 238609295, 226050911, 214748365, 204522253, 195225787, 186737709, diff --git a/libavcodec/i386/mpegvideo_mmx_template.c b/libavcodec/i386/mpegvideo_mmx_template.c index 921eabc544..d59b6efd9c 100644 --- a/libavcodec/i386/mpegvideo_mmx_template.c +++ b/libavcodec/i386/mpegvideo_mmx_template.c @@ -76,7 +76,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s, asm volatile ( "mul %%ecx \n\t" : "=d" (level), "=a"(dummy) - : "a" ((block[0]>>2) + q), "c" (inverse[q<<1]) + : "a" ((block[0]>>2) + q), "c" (ff_inverse[q<<1]) ); #else asm volatile ( diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 2089bd3204..a8124172b6 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -675,7 +675,7 @@ static inline int msmpeg4_pred_dc(MpegEncContext * s, int n, "mull %4 \n\t" "movl %%edx, %2 \n\t" : "+b" (a), "+c" (b), "+D" (c) - : "g" (scale), "S" (inverse[scale]) + : "g" (scale), "S" (ff_inverse[scale]) : "%eax", "%edx" ); #else diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index 831e6faa1e..ca8d0a9562 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -1438,7 +1438,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa voffset=vr->begin; for(partition_count=0;partition_count<ptns_to_read;) { // SPEC error if (!pass) { - uint_fast32_t inverse_class = inverse[vr->classifications]; + uint_fast32_t inverse_class = ff_inverse[vr->classifications]; for(j_times_ptns_to_read=0, j=0;j<ch_used;++j) { if (!do_not_decode[j]) { uint_fast32_t temp=get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table, |