Merge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 10:22:13 +0000 (12:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 10:22:25 +0000 (12:22 +0200)
commit4742edd50e18398160e0400d72d757f2b6f52852
tree84e3f872a8a1b3df81ebfeced33a866cd58cbf37
parent74cb7ef8514846e97b28973f1884ea9d2afbc018
parentc5ab6088ad7b0dac461fb6757b038f5260e638e5
Merge commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5'

* commit 'c5ab6088ad7b0dac461fb6757b038f5260e638e5':
  af_aformat: cosmetics, fix indentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_aformat.c