Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Apr 2013 11:02:20 +0000 (13:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Apr 2013 11:02:29 +0000 (13:02 +0200)
commite4c0f258d38a961aff463c8474936771be7c561e
tree9d806b02d731c883d6e1b2d82ca22f91ca988b5b
parent645d0384e85bb40b2307c559d0cfc914438e5bff
parent9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d
Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'

* commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d':
  afifo: fix request_samples on the last frame in certain cases

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/fifo.c
tests/fate/filter-audio.mak