1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00

Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'

* commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011':
  configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-30 23:34:18 +02:00
commit a99de9ca2c

2
configure vendored
View File

@ -5231,6 +5231,8 @@ for thread in $THREADS_LIST; do
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"