Also rename related variables to match the new name.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18227 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b