Commit a99de9ca authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a0ce85ac'

* commit 'a0ce85ac':
  configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1c84aad7 a0ce85ac
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment