shape-adaptive diamond + prediction crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)

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