reversing not yet reversed changes from r1.7 -> r1.8 except the static/const stuff

this seems to fix all avi parsing bugs
kabi, can u explain what this was good for?

Originally committed as revision 1644 to svn://svn.ffmpeg.org/ffmpeg/trunk