Fixes issue2525
Original patch by Daniel Kang, daniel.d.kang at gmail

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