[FFmpeg-devel] [PATCH] avcodec/ffv1_parser: Rename close to ffv1_close

[FFmpeg-devel] [PATCH] avcodec/ffv1_parser: Rename close to ffv1_close

[Zhao Zhili]

From: Zhao Zhili <zhilizhao@tencent.com>

This fixed wasm checkasm failure

$ wasm-tools validate tests/checkasm/checkasm
error: wasisdk://v25.0/build/sysroot/wasi-libc-wasm32-wasip1-threads/libc-top-half/musl/src/stdio/__stdio_close.c:24:9 function `__stdio_close` failed to validate

Caused by:
    0: func 4581 failed to validate
    1: type mismatch: expected i32 but nothing on stack (at offset 0x43b770)

Since close is declared as static function, it's more like a bug
in wasi sdk, but we can workaround it easily.
---
 libavcodec/ffv1_parser.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/ffv1_parser.c b/libavcodec/ffv1_parser.c
index f36a5dfdbd..bf61e88a2e 100644
--- a/libavcodec/ffv1_parser.c
+++ b/libavcodec/ffv1_parser.c
@@ -70,7 +70,7 @@ static int parse(AVCodecParserContext *s,
     return buf_size;
 }
 
-static void close(AVCodecParserContext *s)
+static void ffv1_close(AVCodecParserContext *s)
 {
     FFV1ParseContext *p = s->priv_data;
 
@@ -82,5 +82,5 @@ const AVCodecParser ff_ffv1_parser = {
     .codec_ids    = { AV_CODEC_ID_FFV1 },
     .priv_data_size = sizeof(FFV1ParseContext),
     .parser_parse = parse,
-    .parser_close = close,
+    .parser_close = ffv1_close,
 };
-- 
2.46.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/ffv1_parser: Rename close to ffv1_close

[Zhao Zhili]

Ping.

> On Feb 19, 2025, at 20:33, Zhao Zhili <quinkblack-at-foxmail.com@ffmpeg.org> wrote:
> 
> From: Zhao Zhili <zhilizhao@tencent.com>
> 
> This fixed wasm checkasm failure
> 
> $ wasm-tools validate tests/checkasm/checkasm
> error: wasisdk://v25.0/build/sysroot/wasi-libc-wasm32-wasip1-threads/libc-top-half/musl/src/stdio/__stdio_close.c:24:9 function `__stdio_close` failed to validate
> 
> Caused by:
>    0: func 4581 failed to validate
>    1: type mismatch: expected i32 but nothing on stack (at offset 0x43b770)
> 
> Since close is declared as static function, it's more like a bug
> in wasi sdk, but we can workaround it easily.
> ---
> libavcodec/ffv1_parser.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/ffv1_parser.c b/libavcodec/ffv1_parser.c
> index f36a5dfdbd..bf61e88a2e 100644
> --- a/libavcodec/ffv1_parser.c
> +++ b/libavcodec/ffv1_parser.c
> @@ -70,7 +70,7 @@ static int parse(AVCodecParserContext *s,
>     return buf_size;
> }
> 
> -static void close(AVCodecParserContext *s)
> +static void ffv1_close(AVCodecParserContext *s)
> {
>     FFV1ParseContext *p = s->priv_data;
> 
> @@ -82,5 +82,5 @@ const AVCodecParser ff_ffv1_parser = {
>     .codec_ids    = { AV_CODEC_ID_FFV1 },
>     .priv_data_size = sizeof(FFV1ParseContext),
>     .parser_parse = parse,
> -    .parser_close = close,
> +    .parser_close = ffv1_close,
> };
> -- 
> 2.46.0
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".