based on patch by Johansson Erik-EJO017, erik.johansson motorola com

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