[FFmpeg-cvslog] Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 28 11:26:57 2013 +0200| [edab63a4067ad4cd35d8d9259620983fc7c843f8] | committer: Michael Niedermayer

Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'

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

Conflicts:
	libavfilter/buffersink.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edab63a4067ad4cd35d8d9259620983fc7c843f8
---