Theres no reason to remove the volatile keyword in a release branch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0e216ed4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>