This is done in preparation for the PNM encoder/decoder split.

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