[FFmpeg-devel] [PATCH 1/7] avformat/dashdec: use av_err2str

[FFmpeg-devel] [PATCH 1/7] avformat/dashdec: use av_err2str

[Marvin Scholz]

There is no need to explicitly specify the buffer, as it
is only ever passed to av_log, so av_err2str can be used.
---
 libavformat/dashenc.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index d4a6fe0304..af92e38bbd 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -277,10 +277,8 @@ static const char *get_extension_str(SegmentType type, int single_file)
 
 static int handle_io_open_error(AVFormatContext *s, int err, char *url) {
     DASHContext *c = s->priv_data;
-    char errbuf[AV_ERROR_MAX_STRING_SIZE];
-    av_strerror(err, errbuf, sizeof(errbuf));
     av_log(s, c->ignore_io_errors ? AV_LOG_WARNING : AV_LOG_ERROR,
-           "Unable to open %s for writing: %s\n", url, errbuf);
+           "Unable to open %s for writing: %s\n", url, av_err2str(err));
     return c->ignore_io_errors ? 0 : err;
 }
 
@@ -1865,9 +1863,8 @@ static void dashenc_delete_file(AVFormatContext *s, char *filename) {
     } else {
         int res = ffurl_delete(filename);
         if (res < 0) {
-            char errbuf[AV_ERROR_MAX_STRING_SIZE];
-            av_strerror(res, errbuf, sizeof(errbuf));
-            av_log(s, (res == AVERROR(ENOENT) ? AV_LOG_WARNING : AV_LOG_ERROR), "failed to delete %s: %s\n", filename, errbuf);
+            av_log(s, (res == AVERROR(ENOENT) ? AV_LOG_WARNING : AV_LOG_ERROR),
+                "failed to delete %s: %s\n", filename, av_err2str(res));
         }
     }
 }
-- 
2.39.5 (Apple Git-154)

_______________________________________________
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] [PATCH 2/7] avformat/crypto: use av_err2str

[Marvin Scholz]

There is no need to explicitly specify the buffer, as it
is only ever passed to av_log, so av_err2str can be used.
---
 libavformat/crypto.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavformat/crypto.c b/libavformat/crypto.c
index 868f6ddc25..da8aa0f0ec 100644
--- a/libavformat/crypto.c
+++ b/libavformat/crypto.c
@@ -313,11 +313,9 @@ static int64_t crypto_seek(URLContext *h, int64_t pos, int whence)
 
         // if we did not get all the bytes
         if (len != 0) {
-            char errbuf[100] = "unknown error";
-            av_strerror(res, errbuf, sizeof(errbuf));
             av_log(h, AV_LOG_ERROR,
                 "Crypto: discard read did not get all the bytes (%d remain) - read returned (%d)-%s\n",
-                len, res, errbuf);
+                len, res, av_err2str(res));
             return AVERROR(EINVAL);
         }
     }
-- 
2.39.5 (Apple Git-154)

_______________________________________________
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] [PATCH 3/7] lavfi/vf_xpsnr: use av_err2str

[Marvin Scholz]

There is no need to explicitly specify the buffer, as it
is only ever passed to av_log, so av_err2str can be used.
---
 libavfilter/vf_xpsnr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavfilter/vf_xpsnr.c b/libavfilter/vf_xpsnr.c
index 3097db0878..34c875456e 100644
--- a/libavfilter/vf_xpsnr.c
+++ b/libavfilter/vf_xpsnr.c
@@ -506,10 +506,9 @@ static av_cold int init(AVFilterContext *ctx)
 
             if (!s->stats_file) {
                 const int err = AVERROR(errno);
-                char buf[128];
 
-                av_strerror(err, buf, sizeof(buf));
-                av_log(ctx, AV_LOG_ERROR, "Could not open statistics file %s: %s\n", s->stats_file_str, buf);
+                av_log(ctx, AV_LOG_ERROR, "Could not open statistics file %s: %s\n",
+                    s->stats_file_str, av_err2str(err));
                 return err;
             }
         }
-- 
2.39.5 (Apple Git-154)

_______________________________________________
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] [PATCH 4/7] tests: lavfi/drawutils: use av_err2str

[Marvin Scholz]

There is no need to explicitly specify the buffer, as it
is only ever passed to printf, so av_err2str can be used.
---
 libavfilter/tests/drawutils.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavfilter/tests/drawutils.c b/libavfilter/tests/drawutils.c
index 7fe53ddf31..2ee46f3a43 100644
--- a/libavfilter/tests/drawutils.c
+++ b/libavfilter/tests/drawutils.c
@@ -37,9 +37,7 @@ int main(void)
                (int)(16 - strlen(desc->name)), "");
         r = ff_draw_init(&draw, f, 0);
         if (r < 0) {
-            char buf[128];
-            av_strerror(r, buf, sizeof(buf));
-            printf("no: %s\n", buf);
+            printf("no: %s\n", av_err2str(r));
             continue;
         }
         ff_draw_color(&draw, &color, (uint8_t[]) { 1, 0, 0, 1 });
-- 
2.39.5 (Apple Git-154)

_______________________________________________
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] [PATCH 5/7] tools/ismindex: use av_err2str

[Marvin Scholz]

There is no need to explicitly specify the buffer, as it
is only ever passed to fprintf, so av_err2str can be used.
---
 tools/ismindex.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tools/ismindex.c b/tools/ismindex.c
index 6fe68d8a79..b110420bf0 100644
--- a/tools/ismindex.c
+++ b/tools/ismindex.c
@@ -149,9 +149,7 @@ static int write_fragment(const char *filename, AVIOContext *in)
     int ret;
 
     if ((ret = avio_open2(&out, filename, AVIO_FLAG_WRITE, NULL, NULL)) < 0) {
-        char errbuf[100];
-        av_strerror(ret, errbuf, sizeof(errbuf));
-        fprintf(stderr, "Unable to open %s: %s\n", filename, errbuf);
+        fprintf(stderr, "Unable to open %s: %s\n", filename, av_err2str(ret));
         return ret;
     }
     ret = copy_tag(in, out, MKBETAG('m', 'o', 'o', 'f'));
@@ -500,20 +498,18 @@ static int handle_file(struct Tracks *tracks, const char *file, int split,
 {
     AVFormatContext *ctx = NULL;
     int err = 0, i, orig_tracks = tracks->nb_tracks;
-    char errbuf[50], *ptr;
+    char *ptr;
     struct Track *track;
 
     err = avformat_open_input(&ctx, file, NULL, NULL);
     if (err < 0) {
-        av_strerror(err, errbuf, sizeof(errbuf));
-        fprintf(stderr, "Unable to open %s: %s\n", file, errbuf);
+        fprintf(stderr, "Unable to open %s: %s\n", file, av_err2str(err));
         return 1;
     }
 
     err = avformat_find_stream_info(ctx, NULL);
     if (err < 0) {
-        av_strerror(err, errbuf, sizeof(errbuf));
-        fprintf(stderr, "Unable to identify %s: %s\n", file, errbuf);
+        fprintf(stderr, "Unable to identify %s: %s\n", file, av_err2str(err));
         goto fail;
     }
 
-- 
2.39.5 (Apple Git-154)

_______________________________________________
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] [PATCH 6/7] tools/sidxindex: use av_err2str

[Marvin Scholz]

There is no need to explicitly specify the buffer, as it
is only ever passed to fprintf, so av_err2str can be used.
---
 tools/sidxindex.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/sidxindex.c b/tools/sidxindex.c
index 3e43d95e02..96b1fce8c4 100644
--- a/tools/sidxindex.c
+++ b/tools/sidxindex.c
@@ -119,20 +119,18 @@ static int handle_file(struct Tracks *tracks, const char *file)
 {
     AVFormatContext *ctx = NULL;
     int err = 0, i, orig_tracks = tracks->nb_tracks;
-    char errbuf[50], *ptr;
+    char *ptr;
     struct Track *track;
 
     err = avformat_open_input(&ctx, file, NULL, NULL);
     if (err < 0) {
-        av_strerror(err, errbuf, sizeof(errbuf));
-        fprintf(stderr, "Unable to open %s: %s\n", file, errbuf);
+        fprintf(stderr, "Unable to open %s: %s\n", file, av_err2str(err));
         return 1;
     }
 
     err = avformat_find_stream_info(ctx, NULL);
     if (err < 0) {
-        av_strerror(err, errbuf, sizeof(errbuf));
-        fprintf(stderr, "Unable to identify %s: %s\n", file, errbuf);
+        fprintf(stderr, "Unable to identify %s: %s\n", file, av_err2str(err));
         goto fail;
     }
 
-- 
2.39.5 (Apple Git-154)

_______________________________________________
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] [PATCH 7/7] tools/aviocat: use av_err2str

[Marvin Scholz]

There is no need to explicitly specify the buffer, as it
is only ever passed to fprintf, so av_err2str can be used.
---
 tools/aviocat.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/tools/aviocat.c b/tools/aviocat.c
index 816ab700ef..7f8a247f1c 100644
--- a/tools/aviocat.c
+++ b/tools/aviocat.c
@@ -37,7 +37,6 @@ int main(int argc, char **argv)
     const char *input_url = NULL, *output_url = NULL;
     int64_t stream_pos = 0;
     int64_t start_time;
-    char errbuf[50];
     AVIOContext *input, *output;
     AVDictionary *in_opts = NULL;
     AVDictionary *out_opts = NULL;
@@ -80,8 +79,7 @@ int main(int argc, char **argv)
 
     ret = avio_open2(&input, input_url, AVIO_FLAG_READ, NULL, &in_opts);
     if (ret) {
-        av_strerror(ret, errbuf, sizeof(errbuf));
-        fprintf(stderr, "Unable to open %s: %s\n", input_url, errbuf);
+        fprintf(stderr, "Unable to open %s: %s\n", input_url, av_err2str(ret));
         return 1;
     }
     if (verbose) {
@@ -95,16 +93,14 @@ int main(int argc, char **argv)
     if (duration && !bps) {
         int64_t size = avio_size(input);
         if (size < 0) {
-            av_strerror(ret, errbuf, sizeof(errbuf));
-            fprintf(stderr, "Unable to get size of %s: %s\n", input_url, errbuf);
+            fprintf(stderr, "Unable to get size of %s: %s\n", input_url, av_err2str(ret));
             goto fail;
         }
         bps = size / duration;
     }
     ret = avio_open2(&output, output_url, AVIO_FLAG_WRITE, NULL, &out_opts);
     if (ret) {
-        av_strerror(ret, errbuf, sizeof(errbuf));
-        fprintf(stderr, "Unable to open %s: %s\n", output_url, errbuf);
+        fprintf(stderr, "Unable to open %s: %s\n", output_url, av_err2str(ret));
         goto fail;
     }
 
@@ -117,8 +113,7 @@ int main(int argc, char **argv)
             break;
         avio_write(output, buf, n);
         if (output->error) {
-            av_strerror(output->error, errbuf, sizeof(errbuf));
-            fprintf(stderr, "Unable to write %s: %s\n", output_url, errbuf);
+            fprintf(stderr, "Unable to write %s: %s\n", output_url, av_err2str(output->error));
             break;
         }
         stream_pos += n;
-- 
2.39.5 (Apple Git-154)

_______________________________________________
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".