mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-10-31 12:36:41 +08:00 
			
		
		
		
	Switch uses of av_fopen_utf8 to avpriv_fopen_utf8
The former has been deprecated. Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
		| @@ -1478,7 +1478,7 @@ static int open_model(AVFilterContext *ctx, RNNModel **model) | |||||||
|  |  | ||||||
|     if (!s->model_name) |     if (!s->model_name) | ||||||
|         return AVERROR(EINVAL); |         return AVERROR(EINVAL); | ||||||
|     f = av_fopen_utf8(s->model_name, "r"); |     f = avpriv_fopen_utf8(s->model_name, "r"); | ||||||
|     if (!f) { |     if (!f) { | ||||||
|         av_log(ctx, AV_LOG_ERROR, "Failed to open model file: %s\n", s->model_name); |         av_log(ctx, AV_LOG_ERROR, "Failed to open model file: %s\n", s->model_name); | ||||||
|         return AVERROR(EINVAL); |         return AVERROR(EINVAL); | ||||||
|   | |||||||
| @@ -210,7 +210,7 @@ int ff_opencl_filter_load_program_from_file(AVFilterContext *avctx, | |||||||
|     const char *src_const; |     const char *src_const; | ||||||
|     int err; |     int err; | ||||||
|  |  | ||||||
|     file = av_fopen_utf8(filename, "r"); |     file = avpriv_fopen_utf8(filename, "r"); | ||||||
|     if (!file) { |     if (!file) { | ||||||
|         av_log(avctx, AV_LOG_ERROR, "Unable to open program " |         av_log(avctx, AV_LOG_ERROR, "Unable to open program " | ||||||
|                "source file \"%s\".\n", filename); |                "source file \"%s\".\n", filename); | ||||||
|   | |||||||
| @@ -416,7 +416,7 @@ static int dump_curves(const char *fname, uint16_t *graph[NB_COMP + 1], | |||||||
|     AVBPrint buf; |     AVBPrint buf; | ||||||
|     const double scale = 1. / (lut_size - 1); |     const double scale = 1. / (lut_size - 1); | ||||||
|     static const char * const colors[] = { "red", "green", "blue", "#404040", }; |     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); |     av_assert0(FF_ARRAY_ELEMS(colors) == NB_COMP + 1); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -131,7 +131,7 @@ static int read_classify_label_file(AVFilterContext *context) | |||||||
|     FILE *file; |     FILE *file; | ||||||
|     DnnClassifyContext *ctx = context->priv; |     DnnClassifyContext *ctx = context->priv; | ||||||
|  |  | ||||||
|     file = av_fopen_utf8(ctx->labels_filename, "r"); |     file = avpriv_fopen_utf8(ctx->labels_filename, "r"); | ||||||
|     if (!file){ |     if (!file){ | ||||||
|         av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename); |         av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename); | ||||||
|         return AVERROR(EINVAL); |         return AVERROR(EINVAL); | ||||||
|   | |||||||
| @@ -244,7 +244,7 @@ static int read_detect_label_file(AVFilterContext *context) | |||||||
|     FILE *file; |     FILE *file; | ||||||
|     DnnDetectContext *ctx = context->priv; |     DnnDetectContext *ctx = context->priv; | ||||||
|  |  | ||||||
|     file = av_fopen_utf8(ctx->labels_filename, "r"); |     file = avpriv_fopen_utf8(ctx->labels_filename, "r"); | ||||||
|     if (!file){ |     if (!file){ | ||||||
|         av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename); |         av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename); | ||||||
|         return AVERROR(EINVAL); |         return AVERROR(EINVAL); | ||||||
|   | |||||||
| @@ -73,7 +73,7 @@ static av_cold int init(AVFilterContext *ctx) | |||||||
|         av_log(ctx, AV_LOG_ERROR, "Hint file must be set.\n"); |         av_log(ctx, AV_LOG_ERROR, "Hint file must be set.\n"); | ||||||
|         return AVERROR(EINVAL); |         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) { |     if (!s->hint) { | ||||||
|         ret = AVERROR(errno); |         ret = AVERROR(errno); | ||||||
|         av_log(ctx, AV_LOG_ERROR, "%s: %s\n", s->hint_file_str, av_err2str(ret)); |         av_log(ctx, AV_LOG_ERROR, "%s: %s\n", s->hint_file_str, av_err2str(ret)); | ||||||
|   | |||||||
| @@ -1243,7 +1243,7 @@ static av_cold int lut3d_init(AVFilterContext *ctx) | |||||||
|         return set_identity_matrix(ctx, 32); |         return set_identity_matrix(ctx, 32); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     f = av_fopen_utf8(lut3d->file, "r"); |     f = avpriv_fopen_utf8(lut3d->file, "r"); | ||||||
|     if (!f) { |     if (!f) { | ||||||
|         ret = AVERROR(errno); |         ret = AVERROR(errno); | ||||||
|         av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut3d->file, av_err2str(ret)); |         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; |         return 0; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     f = av_fopen_utf8(lut1d->file, "r"); |     f = avpriv_fopen_utf8(lut1d->file, "r"); | ||||||
|     if (!f) { |     if (!f) { | ||||||
|         ret = AVERROR(errno); |         ret = AVERROR(errno); | ||||||
|         av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut1d->file, av_err2str(ret)); |         av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut1d->file, av_err2str(ret)); | ||||||
|   | |||||||
| @@ -957,7 +957,7 @@ static av_cold int init(AVFilterContext *ctx) | |||||||
|     size_t bytes_read; |     size_t bytes_read; | ||||||
|     int ret = 0; |     int ret = 0; | ||||||
|  |  | ||||||
|     weights_file = av_fopen_utf8(s->weights_file, "rb"); |     weights_file = avpriv_fopen_utf8(s->weights_file, "rb"); | ||||||
|     if (!weights_file) { |     if (!weights_file) { | ||||||
|         av_log(ctx, AV_LOG_ERROR, "No weights file provided, aborting!\n"); |         av_log(ctx, AV_LOG_ERROR, "No weights file provided, aborting!\n"); | ||||||
|         return AVERROR(EINVAL); |         return AVERROR(EINVAL); | ||||||
|   | |||||||
| @@ -538,7 +538,7 @@ static void disp_node(AVBPrint *buf, | |||||||
| static int disp_tree(const struct color_node *node, const char *fname) | static int disp_tree(const struct color_node *node, const char *fname) | ||||||
| { | { | ||||||
|     AVBPrint buf; |     AVBPrint buf; | ||||||
|     FILE *f = av_fopen_utf8(fname, "w"); |     FILE *f = avpriv_fopen_utf8(fname, "w"); | ||||||
|  |  | ||||||
|     if (!f) { |     if (!f) { | ||||||
|         int ret = AVERROR(errno); |         int ret = AVERROR(errno); | ||||||
|   | |||||||
| @@ -139,7 +139,7 @@ static int populate_ipfs_gateway(URLContext *h) | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     // Get the contents of the gateway file. |     // 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) { |     if (!gateway_file) { | ||||||
|         av_log(h, AV_LOG_WARNING, |         av_log(h, AV_LOG_WARNING, | ||||||
|                "The IPFS gateway file (full uri: %s) doesn't exist. " |                "The IPFS gateway file (full uri: %s) doesn't exist. " | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Martin Storsjö
					Martin Storsjö