Skip to content

V
vlc-2-2
Commit d72e2884 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

contribs: compile ffmpeg.

parent 7998559c
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
extras/contrib/src/contrib-src.mak
View file @ d72e2884
...@@ -967,7 +967,11 @@ ifdef HAVE_CROSS_COMPILE ...@@ -967,7 +967,11 @@ ifdef HAVE_CROSS_COMPILE
FFMPEGCONF += --enable-cross-compile FFMPEGCONF += --enable-cross-compile
endif endif
ifdef HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX ifdef HAVE_CROSS_COMPILE_NEEDS_CROSS_PREFIX
ifndef HAVE_ANDROID
FFMPEGCONF += --cross-prefix=$(HOST)- FFMPEGCONF += --cross-prefix=$(HOST)-
else
FFMPEGCONF += --cross-prefix=arm-linux-androideabi- --arch=armv4l
endif
endif endif
# #
...@@ -996,13 +1000,15 @@ endif ...@@ -996,13 +1000,15 @@ endif
ifndef HAVE_UCLIBC ifndef HAVE_UCLIBC
ifndef HAVE_WINCE ifndef HAVE_WINCE
ifndef HAVE_IOS ifndef HAVE_IOS
ifndef HAVE_ANDROID
FFMPEGCONF+= --enable-libmp3lame --enable-libgsm FFMPEGCONF+= --enable-libmp3lame --enable-libgsm
endif endif
endif endif
endif endif
endif
ifdef CC ifdef CC
FFMPEGCONF += --cc=$(CC) FFMPEGCONF += --cc="$(CC)"
endif endif
ifdef HAVE_MACOSX_ON_INTEL ifdef HAVE_MACOSX_ON_INTEL
...@@ -1124,6 +1130,7 @@ FFMPEG_DEPS-$(HAVE_WIN64) = .lame .gsm .zlib ...@@ -1124,6 +1130,7 @@ FFMPEG_DEPS-$(HAVE_WIN64) = .lame .gsm .zlib
FFMPEG_DEPS-$(HAVE_ARMELF) = .lame .gsm .zlib FFMPEG_DEPS-$(HAVE_ARMELF) = .lame .gsm .zlib
FFMPEG_DEPS-$(HAVE_MACOSX) += .yasm FFMPEG_DEPS-$(HAVE_MACOSX) += .yasm
FFMPEG_DEPS-$(HAVE_WIN32) += .dshow_headers FFMPEG_DEPS-$(HAVE_WIN32) += .dshow_headers
FFMPEG_DEPS-$(HAVE_ANDROID) =
ifdef SVN ifdef SVN
FFMPEG_MK_TARGET = ffmpeg/.svn-$(FFMPEG_SVN_REV) FFMPEG_MK_TARGET = ffmpeg/.svn-$(FFMPEG_SVN_REV)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment