vlc | branch: master | Rémi Duraffort <ivo...@videolan.org> | Tue Dec 28 22:02:56 2010 +0100| [d72e2884abe6bd30b5b2b408f309970bb74de4c3] | committer: Rémi Duraffort
contribs: compile ffmpeg. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d72e2884abe6bd30b5b2b408f309970bb74de4c3 --- extras/contrib/src/contrib-src.mak | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak index bcb011d..37de859 100644 --- a/extras/contrib/src/contrib-src.mak +++ b/extras/contrib/src/contrib-src.mak @@ -967,7 +967,11 @@ ifdef HAVE_CROSS_COMPILE FFMPEGCONF += --enable-cross-compile endif ifdef HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX +ifndef HAVE_ANDROID FFMPEGCONF += --cross-prefix=$(HOST)- +else +FFMPEGCONF += --cross-prefix=arm-linux-androideabi- --arch=armv4l +endif endif # @@ -996,13 +1000,15 @@ endif ifndef HAVE_UCLIBC ifndef HAVE_WINCE ifndef HAVE_IOS +ifndef HAVE_ANDROID FFMPEGCONF+= --enable-libmp3lame --enable-libgsm endif endif endif +endif ifdef CC -FFMPEGCONF += --cc=$(CC) +FFMPEGCONF += --cc="$(CC)" endif ifdef HAVE_MACOSX_ON_INTEL @@ -1124,6 +1130,7 @@ FFMPEG_DEPS-$(HAVE_WIN64) = .lame .gsm .zlib FFMPEG_DEPS-$(HAVE_ARMELF) = .lame .gsm .zlib FFMPEG_DEPS-$(HAVE_MACOSX) += .yasm FFMPEG_DEPS-$(HAVE_WIN32) += .dshow_headers +FFMPEG_DEPS-$(HAVE_ANDROID) = ifdef SVN FFMPEG_MK_TARGET = ffmpeg/.svn-$(FFMPEG_SVN_REV) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
