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