Skip to content

Actions: OpenShot/libopenshot

Actions

Label merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label-merge-conflicts.yml
132 workflow runs
132 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix timeline cache when updating Clips with ApplyJsonDiff (old and ne… Label merge conflicts #955: Commit 6cea273 pushed by jonoomph
July 8, 2025 20:19 8s release-20250612
release-20250612
July 8, 2025 20:19 8s
Fixing Tracker and Object Detection effect to not crash when camera q… Label merge conflicts #954: Commit 9cbfc80 pushed by jonoomph
July 8, 2025 05:22 5s release-20250612
release-20250612
July 8, 2025 05:22 5s
Removing SkipEmptyParts from modified ObjectDetection.cpp code (old Q… Label merge conflicts #953: Commit 22cd563 pushed by jonoomph
June 18, 2025 00:06 7s release-20250612
release-20250612
June 18, 2025 00:06 7s
Improving Tracker and Object Detector to include effect ID in the tra… Label merge conflicts #952: Commit 055975a pushed by jonoomph
June 17, 2025 23:27 7s release-20250612
release-20250612
June 17, 2025 23:27 7s
Improving Tracker effect to better track occluded objects, follow obj… Label merge conflicts #951: Commit 515c4ff pushed by jonoomph
June 15, 2025 21:06 10s release-20250612
release-20250612
June 15, 2025 21:06 10s
Lowering version required for libopenshot-audio, since technically it… Label merge conflicts #950: Commit c6720bb pushed by jonoomph
June 12, 2025 22:34 8s release-20250612
release-20250612
June 12, 2025 22:34 8s
Bumping version to 0.5.0, SO 28, this is a major new release of libop… Label merge conflicts #949: Commit f60d665 pushed by jonoomph
June 12, 2025 22:30 8s release-20250612
release-20250612
June 12, 2025 22:30 8s
Merge pull request #1015 from OpenShot/fix-update-regression Label merge conflicts #948: Commit 7b4e999 pushed by jonoomph
June 7, 2025 22:55 1m 9s develop
develop
June 7, 2025 22:55 1m 9s
Removing Play/Stop implementation from VideoCacheThread. Adding back … Label merge conflicts #947: Commit 0d492ec pushed by jonoomph
June 7, 2025 21:05 7s fix-update-regression
fix-update-regression
June 7, 2025 21:05 7s
Merge pull request #1014 from OpenShot/ffmpeg-performance Label merge conflicts #946: Commit cdaccf2 pushed by jonoomph
June 7, 2025 04:38 1m 8s develop
develop
June 7, 2025 04:38 1m 8s
Including missing sstream include on Profile tests Label merge conflicts #945: Commit 099fe59 pushed by jonoomph
June 6, 2025 22:46 9s ffmpeg-performance
ffmpeg-performance
June 6, 2025 22:46 9s
Removing debug code Label merge conflicts #944: Commit 0fcdcdb pushed by jonoomph
June 6, 2025 21:11 9s ffmpeg-performance
ffmpeg-performance
June 6, 2025 21:11 9s
Reverting experimental libopenshot Mac build changes related to "imag… Label merge conflicts #943: Commit 54b33ed pushed by jonoomph
June 5, 2025 05:23 11s ffmpeg-performance
ffmpeg-performance
June 5, 2025 05:23 11s
Experiment for Mac unit tests Label merge conflicts #942: Commit 2003ae1 pushed by jonoomph
June 5, 2025 05:10 10s ffmpeg-performance
ffmpeg-performance
June 5, 2025 05:10 10s
Experiment for Mac unit tests Label merge conflicts #941: Commit 15936ba pushed by jonoomph
June 5, 2025 05:05 10s ffmpeg-performance
ffmpeg-performance
June 5, 2025 05:05 10s
Fixing unit test building on Mac runner Label merge conflicts #940: Commit 32f291c pushed by jonoomph
June 5, 2025 04:46 10s ffmpeg-performance
ffmpeg-performance
June 5, 2025 04:46 10s
Add libopenshot unit tests back into Mac builder GitLab CI script Label merge conflicts #939: Commit 81a04a1 pushed by jonoomph
June 5, 2025 04:31 9s ffmpeg-performance
ffmpeg-performance
June 5, 2025 04:31 9s
Fix incorrect _MSC_VER and replace with _WIN32 Label merge conflicts #938: Commit 60fbb7f pushed by jonoomph
June 5, 2025 03:42 8s ffmpeg-performance
ffmpeg-performance
June 5, 2025 03:42 8s
Use aligned memory free for QImage / frame buffer (fix crash on Win32… Label merge conflicts #937: Commit 38afcea pushed by jonoomph
June 5, 2025 02:29 11s ffmpeg-performance
ffmpeg-performance
June 5, 2025 02:29 11s
Refactoring aligned malloc to work on Mac, Windows, and Linux (inside… Label merge conflicts #936: Commit b2333ab pushed by jonoomph
June 5, 2025 01:45 7s ffmpeg-performance
ffmpeg-performance
June 5, 2025 01:45 7s
Fixing the alignment of our FFmpegReader video buffers to be 32 / AVX… Label merge conflicts #935: Commit c487aa4 pushed by jonoomph
June 4, 2025 23:37 8s ffmpeg-performance
ffmpeg-performance
June 4, 2025 23:37 8s
Merge pull request #1013 from OpenShot/caching-improvements Label merge conflicts #934: Commit 9a4dcf2 pushed by jonoomph
June 4, 2025 19:44 8s lapl2m-codex/optimize-ffmpegreader-performance-and-memory
lapl2m-codex/optimize-ffmpegreader-performance-and-memory
June 4, 2025 19:44 8s
Merge pull request #1013 from OpenShot/caching-improvements Label merge conflicts #933: Commit 9a4dcf2 pushed by jonoomph
June 4, 2025 19:43 9s codex/optimize-ffmpegreader-performance-and-memory
codex/optimize-ffmpegreader-performance-and-memory
June 4, 2025 19:43 9s
Merge pull request #1013 from OpenShot/caching-improvements Label merge conflicts #932: Commit 9a4dcf2 pushed by jonoomph
June 4, 2025 04:20 1m 8s develop
develop
June 4, 2025 04:20 1m 8s
Unit tests for new VideoCacheThread, to test all helper methods and e… Label merge conflicts #931: Commit 364fb37 pushed by jonoomph
June 4, 2025 03:24 10s caching-improvements
caching-improvements
June 4, 2025 03:24 10s