* qatar/master: vc1: Fix intensity compensation performance regression Conflicts: libavcodec/vc1.c See: ed5bed4152 Merged-by: Michael Niedermayer <michaelni@gmx.at>
ed5bed4152