cleanup ugly code (also appearently works around a bug gcc 3.4 which fails compiling it) by (mru at kth dot se (Måns Rullgård))

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