From 25394eb72ee0f0735ea06b439a8dde428def8dc3 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 6 Sep 2021 12:48:29 +0200 Subject: [PATCH] avcodec/qsv: Make ff_qsv_map_error() static It is only an auxiliary function to ff_qsv_print_(error|warning)(). Signed-off-by: Andreas Rheinhardt --- libavcodec/qsv.c | 11 ++++++----- libavcodec/qsv_internal.h | 5 ----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 139c4971de..2f332092a1 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -147,7 +147,10 @@ static const struct { { MFX_WRN_INCOMPATIBLE_AUDIO_PARAM, 0, "incompatible audio parameters" }, }; -int ff_qsv_map_error(mfxStatus mfx_err, const char **desc) +/** + * Convert a libmfx error code into an FFmpeg error code. + */ +static int qsv_map_error(mfxStatus mfx_err, const char **desc) { int i; for (i = 0; i < FF_ARRAY_ELEMS(qsv_errors); i++) { @@ -166,8 +169,7 @@ int ff_qsv_print_error(void *log_ctx, mfxStatus err, const char *error_string) { const char *desc; - int ret; - ret = ff_qsv_map_error(err, &desc); + int ret = qsv_map_error(err, &desc); av_log(log_ctx, AV_LOG_ERROR, "%s: %s (%d)\n", error_string, desc, err); return ret; } @@ -176,8 +178,7 @@ int ff_qsv_print_warning(void *log_ctx, mfxStatus err, const char *warning_string) { const char *desc; - int ret; - ret = ff_qsv_map_error(err, &desc); + int ret = qsv_map_error(err, &desc); av_log(log_ctx, AV_LOG_WARNING, "%s: %s (%d)\n", warning_string, desc, err); return ret; } diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 6b96c413c5..8090b748b3 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -106,11 +106,6 @@ typedef struct QSVFramesContext { int ff_qsv_print_iopattern(void *log_ctx, int mfx_iopattern, const char *extra_string); -/** - * Convert a libmfx error code into an ffmpeg error code. - */ -int ff_qsv_map_error(mfxStatus mfx_err, const char **desc); - int ff_qsv_print_error(void *log_ctx, mfxStatus err, const char *error_string);