Now that it is exported, this should avoid confusion and name clashes.

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