hopefully allows for further simplifications in the future. Originally committed as revision 18280 to svn://svn.ffmpeg.org/ffmpeg/trunk