Merge commit '3799376dd3373ee255651ed542c75b15665801a8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 07:35:03 +0000 (09:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 07:35:03 +0000 (09:35 +0200)
commitbb5ef961647f06425eff236d9575db0ab6ae66f1
tree6f5148c7061625a39caedc299d8477aeeb00139b
parenta59a64cbc85375b7a6a0266c62f654e2ea80a5c6
parent3799376dd3373ee255651ed542c75b15665801a8
Merge commit '3799376dd3373ee255651ed542c75b15665801a8'

* commit '3799376dd3373ee255651ed542c75b15665801a8':
  lavfi/fifo: fix flushing when using request_samples

Conflicts:
libavfilter/fifo.c

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