Merge commit '4af5310d29379283553bcd9f541a3f6c317f706e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jan 2013 12:49:45 +0000 (13:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jan 2013 12:49:45 +0000 (13:49 +0100)
commit766f0552012480934b65a1935d272f6c8cf756fe
treeac5f7e026853cb7af6bdc3a58eb250493de56a1a
parentb4a7f4d018aaeb29d18d5982e7234e472b58bac6
parent4af5310d29379283553bcd9f541a3f6c317f706e
Merge commit '4af5310d29379283553bcd9f541a3f6c317f706e'

* commit '4af5310d29379283553bcd9f541a3f6c317f706e':
  get_bits/put_bits: K&R formatting cosmetics

Conflicts:
libavcodec/get_bits.h
libavcodec/put_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/get_bits.h
libavcodec/put_bits.h