[FFmpeg-cvslog] Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep  6 13:00:47 2013 +0200| [2a27e5255071e2bac7f78f484c528d0810be73a0] | committer: Michael Niedermayer

Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'

* commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29':
  mpeg12enc: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a27e5255071e2bac7f78f484c528d0810be73a0
---