virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47'

Browse Source 
* commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47':
  configure: Separate "ln" command line arguments

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-26 12:32:17 +01:00
parent f6fff8e546 b58b00aeca
commit 2b277f2992
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@@ -2120,7 +2120,7 @@ cxx_default="g++"
host_cc_default="gcc"
cp_f="cp -f"
install="install"
ln_s="ln -sf"
ln_s="ln -s -f"
nm_default="nm -g"
objformat="elf"
pkg_config_default=pkg-config
@@ -3391,7 +3391,6 @@ case $target_os in
network_extralibs='-lbsd'
exeobjs=compat/plan9/main.o
disable ffserver
ln_s='ln -s -f'
cp_f='cp'
;;
none)