merging some related stuff from mobilehackers

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