* qatar/master: mpeg: K&R formatting cosmetics Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>