Use doubles in ff_set_min_dist_lsf(). After this patch, AMR can use this

function with no change in output.

Originally committed as revision 20511 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c
index ffd2410..ce0fbc2 100644 (file)
--- a/libavcodec/lsp.c
+++ b/libavcodec/lsp.c
@@ -47,7 +47,7 @@ void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, in
     lsfq[lp_order-1] = FFMIN(lsfq[lp_order-1], lsfq_max);//Is warning required ?
 }
 
-void ff_set_min_dist_lsf(float *lsf, float min_spacing, int size)
+void ff_set_min_dist_lsf(float *lsf, double min_spacing, int size)
 {
     int i;
     float prev = 0.0;

diff --git a/libavcodec/lsp.h b/libavcodec/lsp.h
index 18d9772..9c02000 100644 (file)
--- a/libavcodec/lsp.h
+++ b/libavcodec/lsp.h
@@ -50,7 +50,7 @@ void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, in
  * @param min_spacing    minimum distance between two consecutive lsf values
  * @param                size size of the lsf vector
  */
-void ff_set_min_dist_lsf(float *lsf, float min_spacing, int order);
+void ff_set_min_dist_lsf(float *lsf, double min_spacing, int order);
 
 /**
  * \brief Convert LSF to LSP