matches the order of some other stuff and allows some simplifications)

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