-
Michael Niedermayer authored
* commit '20c86571': lavfi: let gcc realign the stack on public graph driving functions Conflicts: libavfilter/buffersink.c libavfilter/buffersrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
e7f8493f
* commit '20c86571': lavfi: let gcc realign the stack on public graph driving functions Conflicts: libavfilter/buffersink.c libavfilter/buffersrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>