Patch by James Zern <jzern at google>

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23245 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b