(cherry picked from commit 5c19f64c60)
5c19f64c60
Originally committed as revision 25375 to svn://svn.ffmpeg.org/ffmpeg/trunk