Also rename related variables to match the new name.

Originally committed as revision 18227 to svn://svn.ffmpeg.org/ffmpeg/trunk