This correctly fixes issue961, thanks to steven warren for spotting my mistake.

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