Skip to content

Commit 6076dbc

Browse files
mstorsjomstorsjo
committed
Switch uses of av_fopen_utf8 to avpriv_fopen_utf8
The former has been deprecated. Signed-off-by: Martin Storsjö <martin@martin.st>
1 parent 4cdc14a commit 6076dbc

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

‎libavfilter/af_arnndn.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ static int open_model(AVFilterContext *ctx, RNNModel **model)
14781478

14791479
if (!s->model_name)
14801480
return AVERROR(EINVAL);
1481-
f = av_fopen_utf8(s->model_name, "r");
1481+
f = avpriv_fopen_utf8(s->model_name, "r");
14821482
if (!f) {
14831483
av_log(ctx, AV_LOG_ERROR, "Failed to open model file: %s\n", s->model_name);
14841484
return AVERROR(EINVAL);

‎libavfilter/opencl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ int ff_opencl_filter_load_program_from_file(AVFilterContext *avctx,
210210
const char *src_const;
211211
int err;
212212

213-
file = av_fopen_utf8(filename, "r");
213+
file = avpriv_fopen_utf8(filename, "r");
214214
if (!file) {
215215
av_log(avctx, AV_LOG_ERROR, "Unable to open program "
216216
"source file \"%s\".\n", filename);

‎libavfilter/vf_curves.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ static int dump_curves(const char *fname, uint16_t *graph[NB_COMP + 1],
416416
AVBPrint buf;
417417
const double scale = 1. / (lut_size - 1);
418418
static const char * const colors[] = { "red", "green", "blue", "#404040", };
419-
FILE *f = av_fopen_utf8(fname, "w");
419+
FILE *f = avpriv_fopen_utf8(fname, "w");
420420

421421
av_assert0(FF_ARRAY_ELEMS(colors) == NB_COMP + 1);
422422

‎libavfilter/vf_dnn_classify.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static int read_classify_label_file(AVFilterContext *context)
131131
FILE *file;
132132
DnnClassifyContext *ctx = context->priv;
133133

134-
file = av_fopen_utf8(ctx->labels_filename, "r");
134+
file = avpriv_fopen_utf8(ctx->labels_filename, "r");
135135
if (!file){
136136
av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename);
137137
return AVERROR(EINVAL);

‎libavfilter/vf_dnn_detect.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ static int read_detect_label_file(AVFilterContext *context)
244244
FILE *file;
245245
DnnDetectContext *ctx = context->priv;
246246

247-
file = av_fopen_utf8(ctx->labels_filename, "r");
247+
file = avpriv_fopen_utf8(ctx->labels_filename, "r");
248248
if (!file){
249249
av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename);
250250
return AVERROR(EINVAL);

‎libavfilter/vf_fieldhint.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static av_cold int init(AVFilterContext *ctx)
7373
av_log(ctx, AV_LOG_ERROR, "Hint file must be set.\n");
7474
return AVERROR(EINVAL);
7575
}
76-
s->hint = av_fopen_utf8(s->hint_file_str, "r");
76+
s->hint = avpriv_fopen_utf8(s->hint_file_str, "r");
7777
if (!s->hint) {
7878
ret = AVERROR(errno);
7979
av_log(ctx, AV_LOG_ERROR, "%s: %s\n", s->hint_file_str, av_err2str(ret));

‎libavfilter/vf_lut3d.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ static av_cold int lut3d_init(AVFilterContext *ctx)
12431243
return set_identity_matrix(ctx, 32);
12441244
}
12451245

1246-
f = av_fopen_utf8(lut3d->file, "r");
1246+
f = avpriv_fopen_utf8(lut3d->file, "r");
12471247
if (!f) {
12481248
ret = AVERROR(errno);
12491249
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)
21342134
return 0;
21352135
}
21362136

2137-
f = av_fopen_utf8(lut1d->file, "r");
2137+
f = avpriv_fopen_utf8(lut1d->file, "r");
21382138
if (!f) {
21392139
ret = AVERROR(errno);
21402140
av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut1d->file, av_err2str(ret));

‎libavfilter/vf_nnedi.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ static av_cold int init(AVFilterContext *ctx)
957957
size_t bytes_read;
958958
int ret = 0;
959959

960-
weights_file = av_fopen_utf8(s->weights_file, "rb");
960+
weights_file = avpriv_fopen_utf8(s->weights_file, "rb");
961961
if (!weights_file) {
962962
av_log(ctx, AV_LOG_ERROR, "No weights file provided, aborting!\n");
963963
return AVERROR(EINVAL);

‎libavfilter/vf_paletteuse.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ static void disp_node(AVBPrint *buf,
538538
static int disp_tree(const struct color_node *node, const char *fname)
539539
{
540540
AVBPrint buf;
541-
FILE *f = av_fopen_utf8(fname, "w");
541+
FILE *f = avpriv_fopen_utf8(fname, "w");
542542

543543
if (!f) {
544544
int ret = AVERROR(errno);

‎libavformat/ipfsgateway.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static int populate_ipfs_gateway(URLContext *h)
139139
}
140140

141141
// Get the contents of the gateway file.
142-
gateway_file = av_fopen_utf8(ipfs_gateway_file, "r");
142+
gateway_file = avpriv_fopen_utf8(ipfs_gateway_file, "r");
143143
if (!gateway_file) {
144144
av_log(h, AV_LOG_WARNING,
145145
"The IPFS gateway file (full uri: %s) doesn't exist. "

0 commit comments

Comments
 (0)