Merge commit 'd261719319a505e1716e8b52fc955bef0503ff96'

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

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc configure
index 11c30db,a5407c7..b1e9e29
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2424,22 -2032,20 +2424,23 @@@ postproc_deps="avutil gpl
  swscale_deps="avutil"
  
  # programs
 -avconv_deps="avcodec avfilter avformat avresample swscale"
 -avconv_select="aformat_filter anull_filter asyncts_filter atrim_filter format_filter
 -               fps_filter null_filter resample_filter scale_filter
 +ffmpeg_deps="avcodec avfilter avformat swresample"
 +ffmpeg_select="aformat_filter anull_filter atrim_filter format_filter
 +               null_filter
                 setpts_filter trim_filter"
 -avplay_deps="avcodec avformat avresample swscale sdl"
 -avplay_libs='$sdl_libs'
 -avplay_select="rdft"
 -avprobe_deps="avcodec avformat"
 -avserver_deps="avformat fork !shared"
 -avserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
 +ffplay_deps="avcodec avformat swscale swresample sdl"
++ffplay_libs='$sdl_libs'
 +ffplay_select="rdft crop_filter"
 +ffprobe_deps="avcodec avformat"
 +ffserver_deps="avformat fork sarestart"
 +ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
  
  # documentation
 -pod2man_deps="doc"
 -texi2html_deps="doc"
 +podpages_deps="perl"
 +manpages_deps="perl pod2man"
 +htmlpages_deps="perl texi2html"
 +txtpages_deps="perl makeinfo"
 +doc_deps_any="manpages htmlpages podpages txtpages"
  
  # default parameters
  
@@@ -4635,12 -4040,10 +4636,13 @@@ enabled vdpau &
      disable vdpau
  
  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 avconv_libs $($ldflags_filter "-lvdpau") &&
++    prepend ffmpeg_libs $($ldflags_filter "-lvdpau") &&
      enable vdpau_x11
  
 +# Funny iconv installations are not unusual, so check it after all flags have been set
 +disabled iconv || check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || disable iconv
 +
  enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
  
  # add some useful compiler flags if supported
@@@ -5102,8 -4421,7 +5104,7 @@@ HOSTLD_O=$HOSTLD_
  TARGET_EXEC=$target_exec $target_exec_args
  TARGET_PATH=$target_path
  TARGET_SAMPLES=${target_samples:-\$(SAMPLES)}
- LIBS-ffplay=$sdl_libs
 -CFLAGS-avplay=$sdl_cflags
 +CFLAGS-ffplay=$sdl_cflags
  ZLIB=$($ldflags_filter -lz)
  LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
  EXTRALIBS=$extralibs
@@@ -5138,27 -4454,27 +5139,34 @@@ get_version()
  
  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
  /* Automatically generated by configure - do not modify! */
 -#ifndef LIBAV_CONFIG_H
 -#define LIBAV_CONFIG_H
 -#define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"
 -#define LIBAV_LICENSE "$(c_escape $license)"
 +#ifndef FFMPEG_CONFIG_H
 +#define FFMPEG_CONFIG_H
 +#define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
 +#define FFMPEG_LICENSE "$(c_escape $license)"
 +#define CONFIG_THIS_YEAR 2014
 +#define FFMPEG_DATADIR "$(eval c_escape $datadir)"
  #define AVCONV_DATADIR "$(eval c_escape $datadir)"
  #define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})"
 -#define restrict $_restrict
 +#define av_restrict $_restrict
  #define EXTERN_PREFIX "${extern_prefix}"
  #define EXTERN_ASM ${extern_prefix}
 +#define BUILDSUF "$build_suffix"
  #define SLIBSUF "$SLIBSUF"
 +#define HAVE_MMX2 HAVE_MMXEXT
  EOF
  
 +test -n "$assert_level" &&
 +    echo "#define ASSERT_LEVEL $assert_level" >>$TMPH
 +
  test -n "$malloc_prefix" &&
      echo "#define MALLOC_PREFIX $malloc_prefix" >>$TMPH