* commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29': mpeg12enc: K&R formatting cosmetics Conflicts: libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>