Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 17:45:07 +0000 (19:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 17:45:07 +0000 (19:45 +0200)
commit02a31f6a7490a1a76ac36297ec9bd05f07eeeb24
tree6516e1c32ec9443d842d50f7e6ee732695286e0c
parent4c18c31438d0f3357fc705b6d03d74728045a17f
parent2c993e8b5ecaeb5c8508ce18d6f4ed93b9246d19
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: K&R formatting cosmetics

Conflicts:
libavcodec/golomb.h

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