Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 09:26:57 +0000 (11:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 28 Jul 2013 09:26:57 +0000 (11:26 +0200)
commitedab63a4067ad4cd35d8d9259620983fc7c843f8
tree1b3da86553d3db4ac1637cc84e657bc49fa03154
parent63c0113588d61d5ed045e1937c473770453c53be
parent966689442ed843019dc0722a49bfb0ac51755d19
Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'

* commit '966689442ed843019dc0722a49bfb0ac51755d19':
  buffersink: K&R formatting cosmetics

Conflicts:
libavfilter/buffersink.c

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