@@ -22,7 +22,7 @@
#include "libavcodec/vorbisdsp.h"
void ff_vorbis_inverse_coupling_neon(float *mag, float *ang,
- intptr_t blocksize);
+ ptrdiff_t blocksize);
av_cold void ff_vorbisdsp_init_aarch64(VorbisDSPContext *c)
{
@@ -25,7 +25,7 @@
#include "libavcodec/vorbisdsp.h"
void ff_vorbis_inverse_coupling_neon(float *mag, float *ang,
- intptr_t blocksize);
+ ptrdiff_t blocksize);
av_cold void ff_vorbisdsp_init_arm(VorbisDSPContext *c)
{
@@ -29,7 +29,7 @@
#if HAVE_ALTIVEC
static void vorbis_inverse_coupling_altivec(float *mag, float *ang,
- intptr_t blocksize)
+ ptrdiff_t blocksize)
{
vector float m, a;
vector bool int t0, t1;
@@ -45,7 +45,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num);
void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,
uint16_t *y_list, int *flag,
int multiplier, float * out, int samples);
-void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize);
+void ff_vorbis_inverse_coupling(float *mag, float *ang, ptrdiff_t blocksize);
#define ilog(i) av_log2(2*(i))
@@ -1579,7 +1579,7 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr,
}
}
-void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize)
+void ff_vorbis_inverse_coupling(float *mag, float *ang, ptrdiff_t blocksize)
{
for (ptrdiff_t i = 0; i < blocksize; i++) {
if (mag[i] > 0.0) {
@@ -19,12 +19,12 @@
#ifndef AVCODEC_VORBISDSP_H
#define AVCODEC_VORBISDSP_H
-#include <stdint.h>
+#include <stddef.h>
typedef struct VorbisDSPContext {
/* assume len is a multiple of 4, and arrays are 16-byte aligned */
void (*vorbis_inverse_coupling)(float *mag, float *ang,
- intptr_t blocksize);
+ ptrdiff_t blocksize);
} VorbisDSPContext;
void ff_vorbisdsp_init(VorbisDSPContext *dsp);
@@ -25,7 +25,7 @@
#include "libavcodec/vorbisdsp.h"
void ff_vorbis_inverse_coupling_sse(float *mag, float *ang,
- intptr_t blocksize);
+ ptrdiff_t blocksize);
av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp)
{
From: Rémi Denis-Courmont <remi@remlab.net> ... for a difference between pointers. --- libavcodec/aarch64/vorbisdsp_init.c | 2 +- libavcodec/arm/vorbisdsp_init_arm.c | 2 +- libavcodec/ppc/vorbisdsp_altivec.c | 2 +- libavcodec/vorbis.h | 2 +- libavcodec/vorbisdec.c | 2 +- libavcodec/vorbisdsp.h | 4 ++-- libavcodec/x86/vorbisdsp_init.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)