fix feed read_header, avoid using put_tag in write_header, to be consistent with read_header, also some minor cosmetics

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