[FFmpeg-cvslog] g729dec: Fix warnings:
Vitor Sessak
git at videolan.org
Sun Sep 25 21:44:32 CEST 2011
ffmpeg | branch: master | Vitor Sessak <vitor1001 at gmail.com> | Sun Sep 25 20:07:33 2011 +0200| [82d99e0b417a1f64821ceae3b5ce032dbb117b54] | committer: Michael Niedermayer
g729dec: Fix warnings:
libavcodec/g729dec.c: In function ‘decode_frame’:
libavcodec/g729dec.c:662: warning: passing argument 3 of ‘ff_g729_postfilter’ from incompatible pointer type
libavcodec/g729postfilter.h:96: note: expected ‘int16_t *’ but argument is of type ‘int *’
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82d99e0b417a1f64821ceae3b5ce032dbb117b54
---
libavcodec/g729postfilter.c | 2 +-
libavcodec/g729postfilter.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/g729postfilter.c b/libavcodec/g729postfilter.c
index 4f2f0c2..8cc29ab 100644
--- a/libavcodec/g729postfilter.c
+++ b/libavcodec/g729postfilter.c
@@ -511,7 +511,7 @@ static int16_t apply_tilt_comp(int16_t* out, int16_t* res_pst, int refl_coeff,
return tmp;
}
-void ff_g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int16_t* voicing,
+void ff_g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int* voicing,
const int16_t *lp_filter_coeffs, int pitch_delay_int,
int16_t* residual, int16_t* res_filter_data,
int16_t* pos_filter_data, int16_t *speech, int subframe_size)
diff --git a/libavcodec/g729postfilter.h b/libavcodec/g729postfilter.h
index 067eb5d..0ccecb2 100644
--- a/libavcodec/g729postfilter.h
+++ b/libavcodec/g729postfilter.h
@@ -93,7 +93,7 @@
* Short-term postfilter (4.2.2).
* Tilt-compensation (4.2.3)
*/
-void ff_g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int16_t* voicing,
+void ff_g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int* voicing,
const int16_t *lp_filter_coeffs, int pitch_delay_int,
int16_t* residual, int16_t* res_filter_data,
int16_t* pos_filter_data, int16_t *speech,
More information about the ffmpeg-cvslog
mailing list