Original patch by Francesco Lavra, francescolavra interfree it

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