Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix compiling with external ffmpeg libraries #515

Closed
wants to merge 1 commit into from

2 participants

@AdamLaurie

Fix multiply defined mp_msg when compiling with external ffmpeg libraries.

@elupus
Collaborator
@AdamLaurie

Yep, I can confirm that it compiles with the whole thing commented out instead of only dropping it when using external ffmpeg libs so that would seem to make sense...

@elupus
Collaborator

Dropped the whole code instead.

@elupus elupus closed this
@tru tru referenced this pull request from a commit in plexinc/plex-home-theater-public
@tru tru Don't forget to restore section after updating the main menu
Fixes #515
8583ca9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 0 deletions.
  1. +2 −0  xbmc/xbmc.cpp
View
2  xbmc/xbmc.cpp
@@ -101,6 +101,7 @@ int main(int argc, char* argv[])
return status;
}
+#ifndef USE_EXTERNAL_FFMPEG
extern "C"
{
void mp_msg( int x, int lev, const char *format, ... )
@@ -119,3 +120,4 @@ extern "C"
OutputDebugString(tmp);
}
}
+#endif
Something went wrong with that request. Please try again.