merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)

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