WIP: updating to SDL_ffmpeg that works with modern ffmpeg #110
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
…w includes SDL_thread.h)
…pdated for new ffmpeg" because SDL_ffmpeg @ FFmpeg-2018 should work with current ffmpeg This reverts commit 3931b34dd4a7a8a3ba0610d3418510d22b92ea94.
|
Only the docker built uses SDL_ffmpeg, so that is the only one testing it and the only one that fails: https://travis-ci.com/civctp2/civctp2/jobs/180436538#L5535 |
|
@ptitSeb, @MartinGuehmann Please go ahead to adjust the ctp2 code to make use of the new SDL_ffmpeg if you find the time, I won't be able to do so in the near future. |
|
Not needed any more with the great work in #298 of @williamd67. |
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.
Regarding #88 this PR concerns updating to SDL_ffmpeg that works with modern ffmpeg. So far it contains the changes to GL-CI for testing this, however building 4d2aee2 fails because SDL_ffmpeg@FFmpeg-2018 demands corrections to its use in the code of ctp2 in
civctp2/ctp2_code/ui/aui_common/aui_movie.cpp
Line 233 in 132f78b
and elsewhere.