fix global name conflicts patch by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)

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