* removing some unused/unneeded code
* unifing some function names

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