Help further refactoring. Originally committed as revision 24814 to svn://svn.ffmpeg.org/ffmpeg/trunk