License change and cpu detection patch by (James Morrison <ja2morri at csclub dot uwaterloo dot ca>)

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