OpenShot Video Library | libopenshot

Merge lp://qastaging/~mbranton/libopenshot/int64_fixes into lp://qastaging/libopenshot/0.0

  1. int64_fixes
  2. Merge into trunk
Proposed by matt
Status: Needs review
Proposed branch: lp://qastaging/~mbranton/libopenshot/int64_fixes
Merge into: lp://qastaging/libopenshot/0.0
Diff against target: 73 lines (+8/-8)
4 files modified
include/AudioReaderSource.h (+4/-4)
include/FFmpegWriter.h (+2/-2)
include/Frame.h (+1/-1)
src/Color.cpp (+1/-1)
To merge this branch: bzr merge lp://qastaging/~mbranton/libopenshot/int64_fixes
Reviewer Review Type Date Requested Status
OpenShot Code Pending
Review via email: mp+308589@code.qastaging.launchpad.net

Description of the change

I have namespace collisions with int64 definitions in libopenshot, this prefixes such definitions to refer to the global namespace definition.

To post a comment you must log in.

Unmerged revisions

562. By Matt Branton <email address hidden>

int64 is ambiguous when trying to add certain external dependencies to libopenshot

561. By Matt Branton <email address hidden>

Set color format so that alpha can be preserved on flood fills

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches