[FFmpeg-devel] [PATCH] fftools/ffprobe: report avio errors

[FFmpeg-devel] [PATCH] fftools/ffprobe: report avio errors

[Marton Balint]

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 fftools/ffprobe.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index 4e2fdbaec8..5020ba484c 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -545,12 +545,13 @@ static const AVClass writer_class = {
     .child_next = writer_child_next,
 };
 
-static void writer_close(WriterContext **wctx)
+static int writer_close(WriterContext **wctx)
 {
     int i;
+    int ret = 0;
 
     if (!*wctx)
-        return;
+        return -1;
 
     if ((*wctx)->writer->uninit)
         (*wctx)->writer->uninit(*wctx);
@@ -562,9 +563,10 @@ static void writer_close(WriterContext **wctx)
     av_opt_free(*wctx);
     if ((*wctx)->avio) {
         avio_flush((*wctx)->avio);
-        avio_close((*wctx)->avio);
+        ret = avio_close((*wctx)->avio);
     }
     av_freep(wctx);
+    return ret;
 }
 
 static void bprint_bytes(AVBPrint *bp, const uint8_t *ubuf, size_t ubuf_size)
@@ -4145,7 +4147,9 @@ int main(int argc, char **argv)
         }
 
         writer_print_section_footer(wctx);
-        writer_close(&wctx);
+        ret = writer_close(&wctx);
+        if (ret < 0)
+            av_log(NULL, AV_LOG_ERROR, "Writing output failed: %s\n", av_err2str(ret));
     }
 
 end:
-- 
2.34.1

_______________________________________________
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] fftools/ffprobe: report avio errors

[Marton Balint]

On Mon, 13 Jun 2022, Marton Balint wrote:

> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
> fftools/ffprobe.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)

Will apply.

Regards,
Marton

>
> diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
> index 4e2fdbaec8..5020ba484c 100644
> --- a/fftools/ffprobe.c
> +++ b/fftools/ffprobe.c
> @@ -545,12 +545,13 @@ static const AVClass writer_class = {
>     .child_next = writer_child_next,
> };
>
> -static void writer_close(WriterContext **wctx)
> +static int writer_close(WriterContext **wctx)
> {
>     int i;
> +    int ret = 0;
>
>     if (!*wctx)
> -        return;
> +        return -1;
>
>     if ((*wctx)->writer->uninit)
>         (*wctx)->writer->uninit(*wctx);
> @@ -562,9 +563,10 @@ static void writer_close(WriterContext **wctx)
>     av_opt_free(*wctx);
>     if ((*wctx)->avio) {
>         avio_flush((*wctx)->avio);
> -        avio_close((*wctx)->avio);
> +        ret = avio_close((*wctx)->avio);
>     }
>     av_freep(wctx);
> +    return ret;
> }
>
> static void bprint_bytes(AVBPrint *bp, const uint8_t *ubuf, size_t ubuf_size)
> @@ -4145,7 +4147,9 @@ int main(int argc, char **argv)
>         }
>
>         writer_print_section_footer(wctx);
> -        writer_close(&wctx);
> +        ret = writer_close(&wctx);
> +        if (ret < 0)
> +            av_log(NULL, AV_LOG_ERROR, "Writing output failed: %s\n", av_err2str(ret));
>     }
>
> end:
> -- 
> 2.34.1
>
> _______________________________________________
> 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".