Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)
Originally committed as revision 24993 to svn://svn.ffmpeg.org/ffmpeg/trunk