[FFmpeg-devel] [PATCH 04/11] avcodec/qsv: Make ff_qsv_map_error() static
Andreas Rheinhardt
andreas.rheinhardt at outlook.com
Mon Sep 6 15:42:54 EEST 2021
It is only an auxiliary function to ff_qsv_print_(error|warning)().
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
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 c53e2e3b07..98e776477c 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -145,7 +145,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++) {
@@ -164,8 +167,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;
}
@@ -174,8 +176,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 327a8d3385..b7ba02fdc7 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);
--
2.30.2
More information about the ffmpeg-devel
mailing list