with few other header files included from the main ffmpeg's dir

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