xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 16 Pull Requests 11 Actions 34.2k Packages Projects Releases 7 Wiki Activity

fix: 删除残留冲突标记
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Frontend Lint (pull_request) Has been cancelled
Details
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been cancelled
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been cancelled
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled
Details

Browse Source
This commit is contained in:
xiaoxia-bot
2026-07-14 10:33:27 +08:00
parent 11f3635b72
commit 51402d6abe
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/worker/video_processing/unified_render_service.py
-1
View File
@@ -1228,7 +1228,6 @@ class UnifiedRenderService:
return min(clip.duration, clip.actual_duration) if clip.actual_duration > 0 else clip.duration
return clip.actual_duration if clip.actual_duration > 0 else 0.0
<<<<<<< HEAD
# ── 画中画（PiP）相关方法 ──────────────────────────────────────────────────
def _resolve_pip_sources(self, pip_config: PiPConfig) -> list[tuple[str, PiPLayerConfig, Path]]: