Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 09:40:49 +0000 (11:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 09:40:49 +0000 (11:40 +0200)
commit102397d2c14dcb58a032832b04fee2fabe2943b2
tree74c6c739dcce3cc714286ab98c5ff7e21a74503d
parentedab63a4067ad4cd35d8d9259620983fc7c843f8
parent16c22122c788b5e54a2f2e224bd0106429f0714c
Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'

* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
  h264: K&R formatting cosmetics

Conflicts:
libavcodec/h264.c

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