This reverts r22296.  This change made some files to fail to open.
The patch submitter has promised to investigate next week.

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