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

2bitoperations
Copy link

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

@foosel
Copy link
Member

foosel 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
Copy link
Member

foosel commented Mar 7, 2016

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

@foosel foosel added the needs some work There are some things to do before this PR can be merged label Mar 7, 2016
@2bitoperations
Copy link
Author

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
allow download/management of mp4 timelapse too
@foosel foosel merged commit 40cefe7 into OctoPrint:devel Mar 7, 2016
@2bitoperations 2bitoperations deleted the add-mp4 branch March 7, 2016 14:45
foosel added a commit that referenced this pull request Mar 14, 2016
@OctopusProteins
Copy link

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

@foosel
Copy link
Member

foosel commented Mar 18, 2016

Please read the release notes of 1.2.10 again.

@OctopusProteins
Copy link

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
Copy link

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 28, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs some work There are some things to do before this PR can be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants