Merge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 22:39:52 +0000 (23:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Mar 2013 22:39:52 +0000 (23:39 +0100)
commit09131ebb562472effd81726c2c14c3ec7164b695
tree07efcaec7b959e1900a2e821e0b0efccfd860cd6
parentbe493ca2a8c4e3a1c147f172cd6ace8673d36f84
parenta2ad554def214d2d03b7c16f68dc081a8622f9ca
Merge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'

* commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca':
  shorten: K&R formatting cosmetics

Conflicts:
libavcodec/shorten.c

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