patch by John Dalgliesh %johnd A defyne P org%

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