Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 11:00:47 +0000 (13:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 11:00:47 +0000 (13:00 +0200)
commit2a27e5255071e2bac7f78f484c528d0810be73a0
tree1dbda94e03f632ad22be3fef1bcac29aeb1cb446
parent61845dc74afce9c33583eb1d0ed82c115ff61d4b
parent7f93a861aaf2e76fd63b53ccc465909873b8dc29
Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'

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

Conflicts:
libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12enc.c