]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f':
  copy_block: K&R formatting cosmetics

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

Simple merge