Patch by Daniel Kristjansson, danielk cuymedia net

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