Mirrors/movie-web
2
0
Fork 0
mirror of https://github.com/movie-web/movie-web.git synced 2024-11-11 01:05:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge issue

Browse Source
This commit is contained in:
Felix Boehme 2023-09-02 16:30:37 +02:00
parent fcebbf404d
commit 5e4e2abe7e
No known key found for this signature in database
GPG Key ID: 7EB0603E4E9642EA
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_oldvideo/components/actions/CaptionRendererAction.tsx
View File

@ -5,7 +5,7 @@ import { ContentCaption } from "subsrt-ts/dist/types/handler";
import { parseSubtitles, sanitize } from "@/backend/helpers/captions"; import { parseSubtitles, sanitize } from "@/backend/helpers/captions";
import { Transition } from "@/components/Transition"; import { Transition } from "@/components/Transition";
import { useSettings } from "@/state/settings"; import { useSettings } from "@/state/settings";
import { getPlayerState } from "@/video/state/cache"; import { getPlayerState } from "@/_oldvideo/state/cache";
import { useVideoPlayerDescriptor } from "../../state/hooks"; import { useVideoPlayerDescriptor } from "../../state/hooks";
import { useProgress } from "../../state/logic/progress"; import { useProgress } from "../../state/logic/progress";