virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'd261719319a505e1716e8b52fc955bef0503ff96'

Browse Source 
* commit 'd261719319a505e1716e8b52fc955bef0503ff96':
  configure: do not link libraries against program-specific dependencies

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-02-14 02:35:36 +01:00
parent fd982f2b40 d261719319
commit 8dc5a46466
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@@ -2429,6 +2429,7 @@ ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
null_filter null_filter
setpts_filter trim_filter" setpts_filter trim_filter"
ffplay_deps="avcodec avformat swscale swresample sdl" ffplay_deps="avcodec avformat swscale swresample sdl"
ffplay_libs='$sdl_libs'
ffplay_select="rdft crop_filter" ffplay_select="rdft crop_filter"
ffprobe_deps="avcodec avformat" ffprobe_deps="avcodec avformat"
ffserver_deps="avformat fork sarestart" ffserver_deps="avformat fork sarestart"
@@ -4635,7 +4636,8 @@ enabled vdpau &&
disable vdpau disable vdpau
enabled vdpau && enabled xlib && enabled vdpau && enabled xlib &&
check_lib2 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau && check_func_headers "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau &&
prepend ffmpeg_libs $($ldflags_filter "-lvdpau") &&
enable vdpau_x11 enable vdpau_x11
# Funny iconv installations are not unusual, so check it after all flags have been set # Funny iconv installations are not unusual, so check it after all flags have been set
@@ -5102,7 +5104,6 @@ HOSTLD_O=$HOSTLD_O
TARGET_EXEC=$target_exec $target_exec_args TARGET_EXEC=$target_exec $target_exec_args
TARGET_PATH=$target_path TARGET_PATH=$target_path
TARGET_SAMPLES=${target_samples:-\$(SAMPLES)} TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
LIBS-ffplay=$sdl_libs
CFLAGS-ffplay=$sdl_cflags CFLAGS-ffplay=$sdl_cflags
ZLIB=$($ldflags_filter -lz) ZLIB=$($ldflags_filter -lz)
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
@@ -5138,6 +5139,13 @@ get_version(){
map 'get_version $v' $LIBRARY_LIST map 'get_version $v' $LIBRARY_LIST
print_program_libs(){
eval "program_libs=\$${1}_libs"
eval echo "LIBS-${1}=${program_libs}" >> config.mak
}
map 'print_program_libs $v' $PROGRAM_LIST
cat > $TMPH <<EOF cat > $TMPH <<EOF
/* Automatically generated by configure - do not modify! */ /* Automatically generated by configure - do not modify! */
#ifndef FFMPEG_CONFIG_H #ifndef FFMPEG_CONFIG_H