[FFmpeg-devel] [PATCH 3/3] Switch uses of av_fopen_utf8 to avpriv_fopen_utf8

["Martin Storsjö" <martin@martin.st>]

---
 libavfilter/af_arnndn.c       | 2 +-
 libavfilter/opencl.c          | 2 +-
 libavfilter/vf_curves.c       | 2 +-
 libavfilter/vf_dnn_classify.c | 2 +-
 libavfilter/vf_dnn_detect.c   | 2 +-
 libavfilter/vf_fieldhint.c    | 2 +-
 libavfilter/vf_lut3d.c        | 4 ++--
 libavfilter/vf_nnedi.c        | 2 +-
 libavfilter/vf_paletteuse.c   | 2 +-
 libavformat/ipfsgateway.c     | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libavfilter/af_arnndn.c b/libavfilter/af_arnndn.c
index fe562e81a1..5e3403ca6a 100644
--- a/libavfilter/af_arnndn.c
+++ b/libavfilter/af_arnndn.c
@@ -1478,7 +1478,7 @@ static int open_model(AVFilterContext *ctx, RNNModel **model)
 
     if (!s->model_name)
         return AVERROR(EINVAL);
-    f = av_fopen_utf8(s->model_name, "r");
+    f = avpriv_fopen_utf8(s->model_name, "r");
     if (!f) {
         av_log(ctx, AV_LOG_ERROR, "Failed to open model file: %s\n", s->model_name);
         return AVERROR(EINVAL);
diff --git a/libavfilter/opencl.c b/libavfilter/opencl.c
index 70d5edb78c..c8e7e6e1a5 100644
--- a/libavfilter/opencl.c
+++ b/libavfilter/opencl.c
@@ -210,7 +210,7 @@ int ff_opencl_filter_load_program_from_file(AVFilterContext *avctx,
     const char *src_const;
     int err;
 
-    file = av_fopen_utf8(filename, "r");
+    file = avpriv_fopen_utf8(filename, "r");
     if (!file) {
         av_log(avctx, AV_LOG_ERROR, "Unable to open program "
                "source file \"%s\".\n", filename);
diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c
index 22a1f8aa70..82e2753f01 100644
--- a/libavfilter/vf_curves.c
+++ b/libavfilter/vf_curves.c
@@ -416,7 +416,7 @@ static int dump_curves(const char *fname, uint16_t *graph[NB_COMP + 1],
     AVBPrint buf;
     const double scale = 1. / (lut_size - 1);
     static const char * const colors[] = { "red", "green", "blue", "#404040", };
-    FILE *f = av_fopen_utf8(fname, "w");
+    FILE *f = avpriv_fopen_utf8(fname, "w");
 
     av_assert0(FF_ARRAY_ELEMS(colors) == NB_COMP + 1);
 
diff --git a/libavfilter/vf_dnn_classify.c b/libavfilter/vf_dnn_classify.c
index c612ba8e80..852f5ddcee 100644
--- a/libavfilter/vf_dnn_classify.c
+++ b/libavfilter/vf_dnn_classify.c
@@ -131,7 +131,7 @@ static int read_classify_label_file(AVFilterContext *context)
     FILE *file;
     DnnClassifyContext *ctx = context->priv;
 
-    file = av_fopen_utf8(ctx->labels_filename, "r");
+    file = avpriv_fopen_utf8(ctx->labels_filename, "r");
     if (!file){
         av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename);
         return AVERROR(EINVAL);
diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c
index dd4507250f..68bd2cd0c3 100644
--- a/libavfilter/vf_dnn_detect.c
+++ b/libavfilter/vf_dnn_detect.c
@@ -244,7 +244,7 @@ static int read_detect_label_file(AVFilterContext *context)
     FILE *file;
     DnnDetectContext *ctx = context->priv;
 
-    file = av_fopen_utf8(ctx->labels_filename, "r");
+    file = avpriv_fopen_utf8(ctx->labels_filename, "r");
     if (!file){
         av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename);
         return AVERROR(EINVAL);
diff --git a/libavfilter/vf_fieldhint.c b/libavfilter/vf_fieldhint.c
index e7afac1116..e6061c6d3c 100644
--- a/libavfilter/vf_fieldhint.c
+++ b/libavfilter/vf_fieldhint.c
@@ -73,7 +73,7 @@ static av_cold int init(AVFilterContext *ctx)
         av_log(ctx, AV_LOG_ERROR, "Hint file must be set.\n");
         return AVERROR(EINVAL);
     }
-    s->hint = av_fopen_utf8(s->hint_file_str, "r");
+    s->hint = avpriv_fopen_utf8(s->hint_file_str, "r");
     if (!s->hint) {
         ret = AVERROR(errno);
         av_log(ctx, AV_LOG_ERROR, "%s: %s\n", s->hint_file_str, av_err2str(ret));
diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c
index a5190b6688..c7ecb7018e 100644
--- a/libavfilter/vf_lut3d.c
+++ b/libavfilter/vf_lut3d.c
@@ -1243,7 +1243,7 @@ static av_cold int lut3d_init(AVFilterContext *ctx)
         return set_identity_matrix(ctx, 32);
     }
 
-    f = av_fopen_utf8(lut3d->file, "r");
+    f = avpriv_fopen_utf8(lut3d->file, "r");
     if (!f) {
         ret = AVERROR(errno);
         av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut3d->file, av_err2str(ret));
@@ -2134,7 +2134,7 @@ static av_cold int lut1d_init(AVFilterContext *ctx)
         return 0;
     }
 
-    f = av_fopen_utf8(lut1d->file, "r");
+    f = avpriv_fopen_utf8(lut1d->file, "r");
     if (!f) {
         ret = AVERROR(errno);
         av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut1d->file, av_err2str(ret));
diff --git a/libavfilter/vf_nnedi.c b/libavfilter/vf_nnedi.c
index 370f643678..e5a16918bd 100644
--- a/libavfilter/vf_nnedi.c
+++ b/libavfilter/vf_nnedi.c
@@ -957,7 +957,7 @@ static av_cold int init(AVFilterContext *ctx)
     size_t bytes_read;
     int ret = 0;
 
-    weights_file = av_fopen_utf8(s->weights_file, "rb");
+    weights_file = avpriv_fopen_utf8(s->weights_file, "rb");
     if (!weights_file) {
         av_log(ctx, AV_LOG_ERROR, "No weights file provided, aborting!\n");
         return AVERROR(EINVAL);
diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c
index e57882a64c..5c491a290c 100644
--- a/libavfilter/vf_paletteuse.c
+++ b/libavfilter/vf_paletteuse.c
@@ -538,7 +538,7 @@ static void disp_node(AVBPrint *buf,
 static int disp_tree(const struct color_node *node, const char *fname)
 {
     AVBPrint buf;
-    FILE *f = av_fopen_utf8(fname, "w");
+    FILE *f = avpriv_fopen_utf8(fname, "w");
 
     if (!f) {
         int ret = AVERROR(errno);
diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c
index 9b0d3dea59..83d52293b4 100644
--- a/libavformat/ipfsgateway.c
+++ b/libavformat/ipfsgateway.c
@@ -139,7 +139,7 @@ static int populate_ipfs_gateway(URLContext *h)
     }
 
     // Get the contents of the gateway file.
-    gateway_file = av_fopen_utf8(ipfs_gateway_file, "r");
+    gateway_file = avpriv_fopen_utf8(ipfs_gateway_file, "r");
     if (!gateway_file) {
         av_log(h, AV_LOG_WARNING,
                "The IPFS gateway file (full uri: %s) doesn't exist. "
-- 
2.32.0 (Apple Git-132)

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