patch by Ramiro Polla, ramiro lisha.ufsc br, simplifications by me

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