Patch by Nicolas Martin - elvadrias at gmail

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