-
Michael Niedermayer authored
* commit '96668944': buffersink: K&R formatting cosmetics Conflicts: libavfilter/buffersink.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
edab63a4
* commit '96668944': buffersink: K&R formatting cosmetics Conflicts: libavfilter/buffersink.c Merged-by: Michael Niedermayer <michaelni@gmx.at>