diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 12:53:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 12:53:41 +0100 |
| commit | 3d04b1aab140ba64ab0f437ab522c03ea6efca06 (patch) | |
| tree | 2946796104f4b4aae82969cbc1a2596246ab26da | |
| parent | 32291ba6eaacc9d4230322361b7bfee052e72040 (diff) | |
| parent | 6a74ebc34dd3875ce8ea672c33aec5c2538eaaaf (diff) | |
| download | ffmpeg-3d04b1aab140ba64ab0f437ab522c03ea6efca06.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float-dsp-test: do not use C99's predefined __func__
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/float_dsp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c index bbbbe3cc42..3477c30060 100644 --- a/libavutil/float_dsp.c +++ b/libavutil/float_dsp.c @@ -221,7 +221,7 @@ static int test_vector_fmul(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, fdsp->vector_fmul(odst, v1, v2, LEN); if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmul failed\n"); return ret; } @@ -241,7 +241,7 @@ static int test_vector_fmac_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *c fdsp->vector_fmac_scalar(odst, src0, scale, LEN); if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMAC_SCALAR_CONST)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmac_scalar failed\n"); return ret; } @@ -257,7 +257,7 @@ static int test_vector_fmul_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *c fdsp->vector_fmul_scalar(odst, v1, scale, LEN); if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmul_scalar failed\n"); return ret; } @@ -273,7 +273,7 @@ static int test_vector_dmul_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *c fdsp->vector_dmul_scalar(odst, v1, scale, LEN); if (ret = compare_doubles(cdst, odst, LEN, DBL_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_dmul_scalar failed\n"); return ret; } @@ -290,7 +290,7 @@ static int test_vector_fmul_window(AVFloatDSPContext *fdsp, AVFloatDSPContext *c fdsp->vector_fmul_window(odst, v1, v2, v3, LEN / 2); if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_WINDOW_CONST)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmul_window failed\n"); return ret; } @@ -307,7 +307,7 @@ static int test_vector_fmul_add(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp fdsp->vector_fmul_add(odst, v1, v2, v3, LEN); if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_ADD_CONST)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmul_add failed\n"); return ret; } @@ -323,7 +323,7 @@ static int test_vector_fmul_reverse(AVFloatDSPContext *fdsp, AVFloatDSPContext * fdsp->vector_fmul_reverse(odst, v1, v2, LEN); if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmul_reverse failed\n"); return ret; } @@ -347,7 +347,7 @@ static int test_butterflies_float(AVFloatDSPContext *fdsp, AVFloatDSPContext *cd if ((ret = compare_floats(cv1, ov1, LEN, FLT_EPSILON)) || (ret = compare_floats(cv2, ov2, LEN, FLT_EPSILON))) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "butterflies_float failed\n"); return ret; } @@ -363,7 +363,7 @@ static int test_scalarproduct_float(AVFloatDSPContext *fdsp, AVFloatDSPContext * oprod = fdsp->scalarproduct_float(v1, v2, LEN); if (ret = compare_floats(&cprod, &oprod, 1, ARBITRARY_SCALARPRODUCT_CONST)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "scalarproduct_float failed\n"); return ret; } |