grouped together. This will save some #ifdefs.

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