From 7d968bda8bfc860e1b135177ceddff1417547ff9 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Fri, 25 Mar 2022 05:13:06 +0800 Subject: [PATCH] chore(config): change LV_FFMPEG_AV_DUMP_FORMAT to LV_FFMPEG_DUMP_FORMAT (#3199) ensure all ffmpeg special config start with the prefix(LV_FFMPEG_) Signed-off-by: Xiang Xiao --- Kconfig | 4 ++-- lv_conf_template.h | 2 +- src/lv_conf_internal.h | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Kconfig b/Kconfig index 3032db32a..eb55b4423 100644 --- a/Kconfig +++ b/Kconfig @@ -969,8 +969,8 @@ menu "LVGL configuration" config LV_USE_FFMPEG bool "FFmpeg library" - config LV_FFMPEG_AV_DUMP_FORMAT - bool "Dump av format" + config LV_FFMPEG_DUMP_FORMAT + bool "Dump format" depends on LV_USE_FFMPEG default n endmenu diff --git a/lv_conf_template.h b/lv_conf_template.h index da484089f..2a1401ee1 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -644,7 +644,7 @@ #define LV_USE_FFMPEG 0 #if LV_USE_FFMPEG /*Dump input information to stderr*/ - #define LV_FFMPEG_AV_DUMP_FORMAT 0 + #define LV_FFMPEG_DUMP_FORMAT 0 #endif /*----------- diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 9befd590f..26e51e714 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -2118,11 +2118,11 @@ #endif #if LV_USE_FFMPEG /*Dump input information to stderr*/ - #ifndef LV_FFMPEG_AV_DUMP_FORMAT - #ifdef CONFIG_LV_FFMPEG_AV_DUMP_FORMAT - #define LV_FFMPEG_AV_DUMP_FORMAT CONFIG_LV_FFMPEG_AV_DUMP_FORMAT + #ifndef LV_FFMPEG_DUMP_FORMAT + #ifdef CONFIG_LV_FFMPEG_DUMP_FORMAT + #define LV_FFMPEG_DUMP_FORMAT CONFIG_LV_FFMPEG_DUMP_FORMAT #else - #define LV_FFMPEG_AV_DUMP_FORMAT 0 + #define LV_FFMPEG_DUMP_FORMAT 0 #endif #endif #endif