Originally committed as revision 21411 to svn://svn.ffmpeg.org/ffmpeg/trunk (cherry picked from commit 420755dd282a913c2163d5589706d6a99a18d10f) Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>