Skip to content
GitLab
Explore
Sign in
Register
VideoLAN
VLMC
Repository
vlmc
src
Workflow
VideoClipWorkflow.cpp
Find file
Blame
History
Permalink
Merge branch 'master' into chouquette_sound_workflow
· 9e190687
Hugo Beauzée-Luyssen
authored
Dec 23, 2009
Conflicts: src/EffectsEngine/LightVideoFrame.cpp src/Renderer/WorkflowRenderer.cpp
9e190687