Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow download/management of mp4 timelapse too #1255

Merged
merged 1 commit into from Mar 7, 2016

Conversation

Projects
None yet
4 participants
@2bitoperations
Copy link
Contributor

commented Mar 5, 2016

in support of issue guysoft/OctoPi#184 , small PR to allow octoprint to manage (and download) mp4 files created with encoding wrapper scripts

@foosel

This comment has been minimized.

Copy link
Owner

commented Mar 5, 2016

hmm, did you do that against a current devel branch? I'm a bit confused by it reporting that there are conflicts...

@foosel

This comment has been minimized.

Copy link
Owner

commented Mar 7, 2016

@2bitoperations I'd love to merge this, can you look into the conflicts? Thanks :)

@2bitoperations 2bitoperations force-pushed the 2bitoperations:add-mp4 branch from bd35ae5 to a00faf2 Mar 7, 2016

@2bitoperations

This comment has been minimized.

Copy link
Contributor Author

commented Mar 7, 2016

sorry for the delay, busy weekend. i had incorrectly based my branch off master instead of devel. fixed now.

foosel added a commit that referenced this pull request Mar 7, 2016

Merge pull request #1255 from 2bitoperations/add-mp4
allow download/management of mp4 timelapse too

@foosel foosel merged commit 40cefe7 into foosel:devel Mar 7, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@2bitoperations 2bitoperations deleted the 2bitoperations:add-mp4 branch Mar 7, 2016

foosel added a commit that referenced this pull request Mar 14, 2016

Added @2bitoperations to AUTHORS.md
Was missing from PR #1255
@OctopusProteins

This comment has been minimized.

Copy link

commented Mar 18, 2016

@foosel , perhaps you could add this into the next octoprint release...
guysoft/OctoPi#184

@foosel

This comment has been minimized.

Copy link
Owner

commented Mar 18, 2016

Please read the release notes of 1.2.10 again.

@OctopusProteins

This comment has been minimized.

Copy link

commented Mar 18, 2016

I saw the release notes. The new version adds support for .mp4, but it doesn't use the mp4 file by default. I think that timelapse files in the mp4 format are more widespread and easier to work with than mpg files. I think having Octoprint export mp4 files would be a great addition. Additionally, the timelapse encoding times are much lower.

@ManuGithubSteam

This comment has been minimized.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.