generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid name clash with libjpeg - added missing externs

Browse Source 
Originally committed as revision 660 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2002-06-04 12:58:40 +00:00
parent c3aea5c424
commit 03c94ede93
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dct-test.c
View File

@ -90,7 +90,7 @@ void dct_error(const char *name, int is_idct,
fdct_func(block);
emms(); /* for ff_mmx_idct */
if (fdct_func == jpeg_fdct_ifast) {
if (fdct_func == fdct_ifast) {
for(i=0; i<64; i++) {
scale = (1 << (AANSCALE_BITS + 11)) / aanscales[i];
block[i] = (block[i] * scale) >> AANSCALE_BITS;
@ -173,7 +173,7 @@ int main(int argc, char **argv)
if (!test_idct) {
dct_error("REF", 0, fdct, fdct); /* only to verify code ! */
dct_error("AAN", 0, jpeg_fdct_ifast, fdct);
dct_error("AAN", 0, fdct_ifast, fdct);
dct_error("MMX", 0, fdct_mmx, fdct);
} else {
dct_error("REF", 1, idct, idct);

3
libavcodec/dsputil.c
View File

@ -23,6 +23,7 @@
#include "simple_idct.h"
void (*ff_idct)(DCTELEM *block);
void (*av_fdct)(DCTELEM *block);
void (*get_pixels)(DCTELEM *block, const UINT8 *pixels, int line_size);
void (*diff_pixels)(DCTELEM *block, const UINT8 *s1, const UINT8 *s2, int stride);
void (*put_pixels_clamped)(const DCTELEM *block, UINT8 *pixels, int line_size);
@ -1278,7 +1279,7 @@ void dsputil_init(void)
pix_abs8x8_x2 = pix_abs8x8_x2_c;
pix_abs8x8_y2 = pix_abs8x8_y2_c;
pix_abs8x8_xy2 = pix_abs8x8_xy2_c;
av_fdct = jpeg_fdct_ifast;
av_fdct = fdct_ifast;
use_permuted_idct = 1;

4
libavcodec/dsputil.h
View File

@ -26,13 +26,13 @@
/* dct code */
typedef short DCTELEM;
void jpeg_fdct_ifast (DCTELEM *data);
void fdct_ifast (DCTELEM *data);
void j_rev_dct (DCTELEM *data);
void fdct_mmx(DCTELEM *block);
void (*av_fdct)(DCTELEM *block);
extern void (*av_fdct)(DCTELEM *block);
/* encoding scans */
extern UINT8 ff_alternate_horizontal_scan[64];

2
libavcodec/jfdctfst.c
View File

@ -113,7 +113,7 @@
*/
GLOBAL(void)
jpeg_fdct_ifast (DCTELEM * data)
fdct_ifast (DCTELEM * data)
{
DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
DCTELEM tmp10, tmp11, tmp12, tmp13;

2
libavcodec/mpegvideo.c
View File

@ -81,7 +81,7 @@ static void convert_matrix(int (*qmat)[64], uint16_t (*qmat16)[64], uint16_t (*q
for(qscale=1; qscale<32; qscale++){
int i;
if (av_fdct == jpeg_fdct_ifast) {
if (av_fdct == fdct_ifast) {
for(i=0;i<64;i++) {
const int j= block_permute_op(i);
/* 16 <= qscale * quant_matrix[i] <= 7905 */