Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:18:57 +0000 (23:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 21:18:57 +0000 (23:18 +0200)
commit9265bae3567c85b55fc4cdfad141bb34a939d6fd
tree402371fa75c079a49acb111b1a560a2cfe15c945
parent9f91e7deecc16172cad1f2904704ed48ffb0e1b0
parentf776899a17dce32ad7fb9231d98f15558f37cc3f
Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'

* commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f':
  bitstream: K&R formatting cosmetics

Conflicts:
libavcodec/bitstream.c

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