Merge commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 07:50:42 +0000 (09:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Jun 2013 07:50:42 +0000 (09:50 +0200)
commit90c8863a749432608b05d2b7d93475e8ebd62bbb
tree76687aa0cbcd6445654198a5128a37ac91fa7091
parent5c3e5651dd88af5da86ef08f01e865bfdea36a3a
parente6496ea7e7ea7355167a1ccbe67a7199d446a654
Merge commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654'

* commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654':
  4xm: K&R formatting cosmetics

Conflicts:
libavformat/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/4xm.c