[FFmpeg-devel] [PATCH] avfilter/vf_drawtext: only test available exceptions

Carl Eugen Hoyos ceffmpeg at gmail.com
Thu Apr 9 02:01:49 EEST 2020


Am Di., 7. Apr. 2020 um 02:46 Uhr schrieb Rosen Penev <rosenp at gmail.com>:
>
> soft float systems do not define these macros under musl.
>
> Fixes: Ticket7102
>
> Signed-off-by: Rosen Penev <rosenp at gmail.com>
> ---
>  libavfilter/vf_drawtext.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
> index 887a686d16..abe1ca6c35 100644
> --- a/libavfilter/vf_drawtext.c
> +++ b/libavfilter/vf_drawtext.c
> @@ -1085,10 +1085,12 @@ static int func_eval_expr_int_format(AVFilterContext *ctx, AVBPrint *bp,
>
>      feclearexcept(FE_ALL_EXCEPT);
>      intval = res;
> +#if defined(FE_INVALID) && defined(FE_OVERFLOW) && defined(FE_UNDERFLOW)
>      if ((ret = fetestexcept(FE_INVALID|FE_OVERFLOW|FE_UNDERFLOW))) {
>          av_log(ctx, AV_LOG_ERROR, "Conversion of floating-point result to int failed. Control register: 0x%08x. Conversion result: %d\n", ret, intval);
>          return AVERROR(EINVAL);
>      }
> +#endif

Patch applied.

Thank you, Carl Eugen


More information about the ffmpeg-devel mailing list