[FFmpeg-devel] [GASPP] [PATCH] Ignore trailing whitespace in .ifc directives

Martin Storsjö martin at martin.st
Sat May 28 01:18:22 EEST 2022


On Wed, 25 May 2022, Martin Storsjö wrote:

> This fixes handling of cases like ".ifc \foo, bar // comment", where
> there was trailing whitespace after the condition (before the comment
> which already was stripped out at this point).
> ---
> Will apply after a couple days.
>
> This fixes the "lavc/aarch64: add hevc horizontal qpel/uni/bi" patch
> when built with MSVC.
> ---
> gas-preprocessor.pl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl
> index 59c93c1..47cb5ab 100755
> --- a/gas-preprocessor.pl
> +++ b/gas-preprocessor.pl
> @@ -344,7 +344,7 @@ sub handle_if {
>             $expr =~ s/\s//g;
>             $result ^= $expr eq "";
>         } elsif ($type eq "c") {
> -            if ($expr =~ /(.*)\s*,\s*(.*)/) {
> +            if ($expr =~ /(\S*)\s*,\s*(\S*)/) {
>                 $result ^= $1 eq $2;
>             } else {
>                 die "argument to .ifc not recognized";
> -- 
> 2.25.1

Pushed this now.

// Martin


More information about the ffmpeg-devel mailing list