Skip to content

Commit

Permalink
[rebrand] ffmpeg extra-version xbmc -> kodi
Browse files Browse the repository at this point in the history
Looking at these for entirely different reason,
these must go anyway.

@FernetMenta
  • Loading branch information
uNiversaI authored and uNiversaI committed Feb 4, 2015
1 parent 387611f commit b2e92bd
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tools/depends/target/ffmpeg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DEPS= ../../Makefile.include FFMPEG-VERSION Makefile
APPLY_PATCHES=no

# configuration settings
ffmpg_config = --prefix=$(PREFIX) --extra-version="xbmc-$(VERSION)"
ffmpg_config = --prefix=$(PREFIX) --extra-version="kodi-$(VERSION)"
ffmpg_config += --cc=$(CC) --cxx=$(CXX) --ar=$(AR) --ranlib=$(RANLIB)
ffmpg_config += --disable-devices --disable-doc
ffmpg_config += --disable-ffplay --disable-ffmpeg --disable-sdl
Expand Down
4 changes: 2 additions & 2 deletions tools/depends/target/ffmpeg/autobuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ tar --strip-components=1 -xf ../${ARCHIVE}

CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \
./configure --prefix=$FFMPEG_PREFIX \
--extra-version="xbmc-${VERSION}" \
--extra-version="kodi-${VERSION}" \
--disable-devices \
--disable-ffplay \
--disable-ffmpeg \
Expand Down Expand Up @@ -167,6 +167,6 @@ then
[ ${SUDO} ] && echo "Root priviledges are required to install to ${FFMPEG_PREFIX}"
${SUDO} make install && echo "$VERSION" > ../.ffmpeg-installed
else
echo "ERROR: building ffmpeg failed"
echo "ERROR: Building ffmpeg failed"
exit 1
fi
4 changes: 2 additions & 2 deletions xbmc/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -615,8 +615,8 @@ bool CApplication::Create()
#endif // !USE_STATIC_FFMPEG
if (!strstr(FFMPEG_VERSION, FFMPEG_VER_SHA))
{
if (strstr(FFMPEG_VERSION, "xbmc"))
CLog::Log(LOGNOTICE, "WARNING: unknown ffmpeg-xbmc version detected");
if (strstr(FFMPEG_VERSION, "kodi"))
CLog::Log(LOGNOTICE, "WARNING: unknown ffmpeg-kodi version detected");
else
CLog::Log(LOGNOTICE, "WARNING: unsupported ffmpeg version detected");
}
Expand Down

0 comments on commit b2e92bd

Please sign in to comment.