Fixes 520 travis build ffmpeg failure #521
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Looks good to me.Sent from my Android device with K-9 Mail. Please excuse my brevity. |
connortechnology
added a commit
that referenced
this pull request
Oct 4, 2014
…ilure Fixes 520 travis build ffmpeg failure
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Current Travis YML was grabbing ffmpeg master branch to build, resulting in build failures based on ffmpeg changes. This pull changes the clone to get the tagged release number from ffmpeg instead. This does mean the project will need to manage the version of ffmpeg that is tested against, but that is probably not a bad thing. Will mean end users can be told ZoneMinder version x works with ffmpeg version y.