Reverse patch 1.59->1.60, it break mp3 in ffplay and ffmpeg

Reversing approved by patch author

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