Merge commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 20:35:48 +0000 (21:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 20:35:58 +0000 (21:35 +0100)
commit990f956ce66b39c997b98cdef9d031201b5a254a
tree4b7cd8280bc59d7348a60f499ebb7cc9a88ecf60
parentaa175983a1968f9c390379e0c735910b5e32ac0d
parentb4e355c89e23664b8dac26936bf3fa7e7bc2110f
Merge commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f'

* commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f':
  copy_block: K&R formatting cosmetics

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