Unified · Split
| @@ -213,17 +213,17 @@ static const char transition_circleclose[] = { · 212 unmodified lines | ||
| 213 | 213 | }; |
| 214 | 214 | |
| 215 | 215 | static const char* transitions_map[NB_TRANSITIONS] = { |
| 216 | − [FADE] = transition_fade, | |
| 217 | − [WIPELEFT] = transition_wipeleft, | |
| 218 | − [WIPERIGHT] = transition_wiperight, | |
| 219 | − [WIPEUP] = transition_wipeup, | |
| 220 | − [WIPEDOWN] = transition_wipedown, | |
| 221 | − [SLIDEDOWN] = transition_slidedown, | |
| 222 | − [SLIDEUP] = transition_slideup, | |
| 223 | − [SLIDELEFT] = transition_slideleft, | |
| 224 | − [SLIDERIGHT]= transition_slideright, | |
| 225 | − [CIRCLEOPEN]= transition_circleopen, | |
| 226 | − [CIRCLECLOSE]=transition_circleclose, | |
| 216 | + [FADE] = transition_fade, | |
| 217 | + [WIPELEFT] = transition_wipeleft, | |
| 218 | + [WIPERIGHT] = transition_wiperight, | |
| 219 | + [WIPEUP] = transition_wipeup, | |
| 220 | + [WIPEDOWN] = transition_wipedown, | |
| 221 | + [SLIDEDOWN] = transition_slidedown, | |
| 222 | + [SLIDEUP] = transition_slideup, | |
| 223 | + [SLIDELEFT] = transition_slideleft, | |
| 224 | + [SLIDERIGHT] = transition_slideright, | |
| 225 | + [CIRCLEOPEN] = transition_circleopen, | |
| 226 | + [CIRCLECLOSE] = transition_circleclose, | |
| 227 | 227 | }; |
| 228 | 228 | |
| 229 | 229 | static av_cold int init_vulkan(AVFilterContext *avctx) |
| @@ -565,17 +565,17 @@ static AVFrame *get_video_buffer(AVFilterLink *inlink, int w, int h) · 335 unmodified lines | ||
| 565 | 565 | |
| 566 | 566 | static const AVOption xfade_vulkan_options[] = { |
| 567 | 567 | { "transition", "set cross fade transition", OFFSET(transition), AV_OPT_TYPE_INT, {.i64=FADE}, 0, NB_TRANSITIONS-1, FLAGS, "transition" }, |
| 568 | − { "fade", "fade transition", 0, AV_OPT_TYPE_CONST, {.i64=FADE}, 0, 0, FLAGS, "transition" }, | |
| 569 | − { "wipeleft", "wipe left transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPELEFT}, 0, 0, FLAGS, "transition" }, | |
| 568 | + { "fade", "fade transition", 0, AV_OPT_TYPE_CONST, {.i64=FADE}, 0, 0, FLAGS, "transition" }, | |
| 569 | + { "wipeleft", "wipe left transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPELEFT}, 0, 0, FLAGS, "transition" }, | |
| 570 | 570 | { "wiperight", "wipe right transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPERIGHT}, 0, 0, FLAGS, "transition" }, |
| 571 | − { "wipeup", "wipe up transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEUP}, 0, 0, FLAGS, "transition" }, | |
| 572 | − { "wipedown", "wipe down transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEDOWN}, 0, 0, FLAGS, "transition" }, | |
| 571 | + { "wipeup", "wipe up transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEUP}, 0, 0, FLAGS, "transition" }, | |
| 572 | + { "wipedown", "wipe down transition", 0, AV_OPT_TYPE_CONST, {.i64=WIPEDOWN}, 0, 0, FLAGS, "transition" }, | |
| 573 | 573 | { "slidedown", "slide down transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDEDOWN}, 0, 0, FLAGS, "transition" }, |
| 574 | − { "slideup", "slide up transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDEUP}, 0, 0, FLAGS, "transition" }, | |
| 574 | + { "slideup", "slide up transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDEUP}, 0, 0, FLAGS, "transition" }, | |
| 575 | 575 | { "slideleft", "slide left transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDELEFT}, 0, 0, FLAGS, "transition" }, |
| 576 | − { "slideright","slide right transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDERIGHT}, 0, 0, FLAGS, "transition" }, | |
| 577 | − { "circleopen","circleopen transition", 0, AV_OPT_TYPE_CONST, {.i64=CIRCLEOPEN}, 0, 0, FLAGS, "transition" }, | |
| 578 | − { "circleclose","circleclose transition", 0, AV_OPT_TYPE_CONST, {.i64=CIRCLECLOSE}, 0, 0, FLAGS, "transition" }, | |
| 576 | + { "slideright", "slide right transition", 0, AV_OPT_TYPE_CONST, {.i64=SLIDERIGHT}, 0, 0, FLAGS, "transition" }, | |
| 577 | + { "circleopen", "circleopen transition", 0, AV_OPT_TYPE_CONST, {.i64=CIRCLEOPEN}, 0, 0, FLAGS, "transition" }, | |
| 578 | + { "circleclose", "circleclose transition", 0, AV_OPT_TYPE_CONST, {.i64=CIRCLECLOSE}, 0, 0, FLAGS, "transition" }, | |
| 579 | 579 | { "duration", "set cross fade duration", OFFSET(duration), AV_OPT_TYPE_DURATION, {.i64=1000000}, 0, 60000000, FLAGS }, |
| 580 | 580 | { "offset", "set cross fade start relative to first input stream", OFFSET(offset), AV_OPT_TYPE_DURATION, {.i64=0}, INT64_MIN, INT64_MAX, FLAGS }, |
| 581 | 581 | { NULL } |