[Ffmpeg-devel] [PATCH] part 23 - portability fixes (ILP32 vs LP64)

[Dieter]

Diffs for file: libavcodec/resample2.c

===================================================================
RCS file: RCS/resample2.c,v
retrieving revision 1.1
diff -u -r1.1 resample2.c
--- resample2.c 2006/01/26 21:02:11     1.1
+++ resample2.c 2006/01/29 22:09:55
@@ -28,22 +28,6 @@
 #include "common.h"
 #include "dsputil.h"
 
-#if 1
-#define FILTER_SHIFT 15
-
-#define FELEM int16_t
-#define FELEM2 int32_t
-#define FELEM_MAX INT16_MAX
-#define FELEM_MIN INT16_MIN
-#else
-#define FILTER_SHIFT 22
-
-#define FELEM int32_t
-#define FELEM2 int64_t
-#define FELEM_MAX INT32_MAX
-#define FELEM_MIN INT32_MIN
-#endif
-
 
 typedef struct AVResampleContext{
     FELEM *filter_bank;
@@ -62,7 +46,7 @@
 /**
  * 0th order modified bessel function of the first kind.
  */
-double bessel(double x){
+static double bessel(double x){
     double v=1;
     double t=1;
     int i;



Diffs for file: libavutil/common.h

===================================================================
RCS file: RCS/common.h,v
retrieving revision 1.1
diff -u -r1.1 common.h
--- common.h    2006/01/26 20:50:28     1.1
+++ common.h    2006/01/30 02:52:23
@@ -610,4 +610,33 @@
 
 #endif /* HAVE_AV_CONFIG_H */
 
+/* moved from libavcodec/resample2.c
+ * needed here for av_build_filter() prototype below
+ */
+#if 1
+#define FILTER_SHIFT 15
+
+#define FELEM int16_t
+#define FELEM2 int32_t
+#define FELEM_MAX INT16_MAX
+#define FELEM_MIN INT16_MIN
+#else
+#define FILTER_SHIFT 22
+
+#define FELEM int32_t
+#define FELEM2 int64_t
+#define FELEM_MAX INT32_MAX
+#define FELEM_MIN INT32_MIN
+#endif
+
+
+ /* prototypes */
+void av_build_filter(FELEM *, double, int, int, int, int);
+void ff_h264_idct_add_mmx2(uint8_t *, int16_t *, int);
+void ff_idct_xvid_mmx(short *);
+void ff_idct_xvid_mmx2(short *);
+void ff_vp3_dsp_init_mmx(void);
+void ff_vp3_idct_mmx(int16_t *);
+void ff_vp3_idct_sse2(int16_t *);
+
 #endif /* COMMON_H */