(though I'm not sure which one is correct - but they should match)

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