* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2': caf: Give context structure a consistent name Merged-by: Michael Niedermayer <michaelni@gmx.at>