Build fix for latest ffmpeg library #199
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
Applied patches from http://forum.xbmc.org/showthread.php?p=803298.
|
I re-pushed the branch (since I had squashed some commits so it didn't show as removing and then re-adding the same change) and lost earlier comments; however, I believe I have addressed all the issues raised. This change has again been tested against internal and a recent external ffmpegs. |
| @@ -84,7 +86,7 @@ extern "C" { | |||
| CH_FRONT_LEFT_OF_CENTER|CH_FRONT_RIGHT_OF_CENTER) | |||
| #endif | |||
|
|
|||
| #if LIBAVCORE_VERSION_INT < AV_VERSION_INT(52,64,0) | |||
| #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,64,0) | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
elupus
added a commit
that referenced
this pull request
Jun 15, 2011
Build fix for latest ffmpeg library
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.
This patch fixes XBMC to build and work with latest ffmpeg; the patch also works fine with the internal ffmpeg. Patch coded by Fneufneu and alexb38; see: http://forum.xbmc.org/showthread.php?t=100601. I just packaged it for submission and verified that it builds and runs with both ffmpegs.
I am not sure if this is the correct final fix; but I would at least like to start a discussion about the fix (here or continued at the above forum link); it's an annoyance to have to continue to manage this fix as a separate branch.