Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 21:34:18 +0000 (23:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 21:34:25 +0000 (23:34 +0200)
* commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011':
  configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

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

diff --cc configure
+++ b/configure
@@@ -5231,32 -4442,14 +5231,34 @@@ for thread in $THREADS_LIST; d
      fi
  done
  
+ enabled zlib && add_cppflags -DZLIB_CONST
  # conditional library dependencies, in linking order
 +enabled aconvert_filter     && prepend avfilter_deps "swresample"
 +enabled amovie_filter       && prepend avfilter_deps "avformat avcodec"
 +enabled aresample_filter    && prepend avfilter_deps "swresample"
 +enabled asyncts_filter      && prepend avfilter_deps "avresample"
 +enabled atempo_filter       && prepend avfilter_deps "avcodec"
 +enabled decimate_filter     && prepend avfilter_deps "avcodec"
 +enabled deshake_filter      && prepend avfilter_deps "avcodec"
 +enabled ebur128_filter && enabled swresample && prepend avfilter_deps "swresample"
 +enabled elbg_filter         && prepend avfilter_deps "avcodec"
 +enabled mcdeint_filter      && prepend avfilter_deps "avcodec"
  enabled movie_filter    && prepend avfilter_deps "avformat avcodec"
 +enabled mp_filter           && prepend avfilter_deps "avcodec"
 +enabled pan_filter          && prepend avfilter_deps "swresample"
 +enabled pp_filter           && prepend avfilter_deps "postproc"
 +enabled removelogo_filter   && prepend avfilter_deps "avformat avcodec swscale"
  enabled resample_filter && prepend avfilter_deps "avresample"
 +enabled sab_filter          && prepend avfilter_deps "swscale"
  enabled scale_filter    && prepend avfilter_deps "swscale"
 +enabled showspectrum_filter && prepend avfilter_deps "avcodec"
 +enabled smartblur_filter    && prepend avfilter_deps "swscale"
 +enabled subtitles_filter    && prepend avfilter_deps "avformat avcodec"
  
 -enabled opus_decoder    && prepend avcodec_deps "avresample"
 +enabled lavfi_indev         && prepend avdevice_deps "avfilter"
 +
 +enabled opus_decoder    && prepend avcodec_deps "swresample"
  
  expand_deps(){
      lib_deps=${1}_deps