From: Marvin Scholz <epirat07@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Marvin Scholz <epirat07@gmail.com>
Subject: [FFmpeg-devel] [PATCH v3 2/5] lavfi/vf_xfade_vulkan: reindent after last commit
Date: Mon, 21 Aug 2023 22:45:24 +0200
Message-ID: <20230821204527.4494-2-epirat07@gmail.com> (raw)
In-Reply-To: <20230821204527.4494-1-epirat07@gmail.com>
---
libavfilter/vf_xfade_vulkan.c | 38 +++++++++++++++++------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/libavfilter/vf_xfade_vulkan.c b/libavfilter/vf_xfade_vulkan.c
index 23c61bdb48..880b3b1afe 100644
--- a/libavfilter/vf_xfade_vulkan.c
+++ b/libavfilter/vf_xfade_vulkan.c
@@ -213,17 +213,17 @@ static const char transition_circleclose[] = {
};
static const char* transitions_map[NB_TRANSITIONS] = {
- [FADE] = transition_fade,
- [WIPELEFT] = transition_wipeleft,
- [WIPERIGHT] = transition_wiperight,
- [WIPEUP] = transition_wipeup,
- [WIPEDOWN] = transition_wipedown,
- [SLIDEDOWN] = transition_slidedown,
- [SLIDEUP] = transition_slideup,
- [SLIDELEFT] = transition_slideleft,
- [SLIDERIGHT]= transition_slideright,
- [CIRCLEOPEN]= transition_circleopen,
- [CIRCLECLOSE]=transition_circleclose,
+ [FADE] = transition_fade,
+ [WIPELEFT] = transition_wipeleft,
+ [WIPERIGHT] = transition_wiperight,
+ [WIPEUP] = transition_wipeup,
+ [WIPEDOWN] = transition_wipedown,
+ [SLIDEDOWN] = transition_slidedown,
+ [SLIDEUP] = transition_slideup,
+ [SLIDELEFT] = transition_slideleft,
+ [SLIDERIGHT] = transition_slideright,
+ [CIRCLEOPEN] = transition_circleopen,
+ [CIRCLECLOSE] = transition_circleclose,
};
static av_cold int init_vulkan(AVFilterContext *avctx)
@@ -565,17 +565,17 @@ static AVFrame *get_video_buffer(AVFilterLink *inlink, int w, int h)
static const AVOption xfade_vulkan_options[] = {
{ "transition", "set cross fade transition", OFFSET(transition), AV_OPT_TYPE_INT, {.i64=FADE}, 0, NB_TRANSITIONS-1, FLAGS, "transition" },
- { "fade", "fade transition", 0, AV_OPT_TYPE_CONST, {.i64=FADE}, 0, 0, FLAGS, "transition" },
- { "wipeleft", "wipe left transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPELEFT}, 0, 0, FLAGS, "transition" },
+ { "fade", "fade transition", 0, AV_OPT_TYPE_CONST, {.i64=FADE}, 0, 0, FLAGS, "transition" },
+ { "wipeleft", "wipe left transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPELEFT}, 0, 0, FLAGS, "transition" },
{ "wiperight", "wipe right transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPERIGHT}, 0, 0, FLAGS, "transition" },
- { "wipeup", "wipe up transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEUP}, 0, 0, FLAGS, "transition" },
- { "wipedown", "wipe down transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEDOWN}, 0, 0, FLAGS, "transition" },
+ { "wipeup", "wipe up transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEUP}, 0, 0, FLAGS, "transition" },
+ { "wipedown", "wipe down transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEDOWN}, 0, 0, FLAGS, "transition" },
{ "slidedown", "slide down transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDEDOWN}, 0, 0, FLAGS, "transition" },
- { "slideup", "slide up transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDEUP}, 0, 0, FLAGS, "transition" },
+ { "slideup", "slide up transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDEUP}, 0, 0, FLAGS, "transition" },
{ "slideleft", "slide left transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDELEFT}, 0, 0, FLAGS, "transition" },
- { "slideright","slide right transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDERIGHT}, 0, 0, FLAGS, "transition" },
- { "circleopen","circleopen transition", 0, AV_OPT_TYPE_CONST, {.i64=CIRCLEOPEN}, 0, 0, FLAGS, "transition" },
- { "circleclose","circleclose transition", 0, AV_OPT_TYPE_CONST, {.i64=CIRCLECLOSE}, 0, 0, FLAGS, "transition" },
+ { "slideright", "slide right transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDERIGHT}, 0, 0, FLAGS, "transition" },
+ { "circleopen", "circleopen transition", 0, AV_OPT_TYPE_CONST, {.i64=CIRCLEOPEN}, 0, 0, FLAGS, "transition" },
+ { "circleclose", "circleclose transition", 0, AV_OPT_TYPE_CONST, {.i64=CIRCLECLOSE}, 0, 0, FLAGS, "transition" },
{ "duration", "set cross fade duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=1000000}, 0, 60000000, FLAGS },
{ "offset", "set cross fade start relative to first input stream", OFFSET(offset), AV_OPT_TYPE_DURATION, {.i64=0}, INT64_MIN, INT64_MAX, FLAGS },
{ NULL }
--
2.37.0 (Apple Git-136)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-08-21 20:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230724211107.40025-2-epirat07@gmail.com%3Emessage://%3C20230724211107.40025-1-epirat07@gmail.com>
2023-07-24 21:47 ` [FFmpeg-devel] [PATCH 1/2] lavfi/vf_xfade_vulkan: add circleopen/circleclose Marvin Scholz
2023-07-24 21:47 ` [FFmpeg-devel] [PATCH 2/2] lavfi/vf_xfade_vulkan: reindent after last commit Marvin Scholz
2023-07-24 22:39 ` [FFmpeg-devel] [PATCH 3/3] lavfi/vf_xfade_vulkan: add dissolve Marvin Scholz
2023-08-21 20:45 ` [FFmpeg-devel] [PATCH v3 1/5] lavfi/vf_xfade_vulkan: add circleopen/circleclose Marvin Scholz
2023-08-21 20:45 ` Marvin Scholz [this message]
2023-08-21 20:45 ` [FFmpeg-devel] [PATCH v3 3/5] lavfi/vf_xfade_vulkan: add dissolve Marvin Scholz
2023-08-21 20:45 ` [FFmpeg-devel] [PATCH v3 4/5] lavfi/vf_xfade_vulkan: add pixelize Marvin Scholz
2023-08-21 20:45 ` [FFmpeg-devel] [PATCH v3 5/5] lavfi/vf_xfade_vulkan: add wipes Marvin Scholz
2023-08-25 3:01 ` Lynne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230821204527.4494-2-epirat07@gmail.com \
--to=epirat07@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git