-
Michael Niedermayer authored
* commit '3799376d': lavfi/fifo: fix flushing when using request_samples Conflicts: libavfilter/fifo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
bb5ef961
* commit '3799376d': lavfi/fifo: fix flushing when using request_samples Conflicts: libavfilter/fifo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>