Merge commit 'f7c5fd81516fb7b186c64c66dc080e1139586226'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 12:00:20 +0000 (14:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 12:03:02 +0000 (14:03 +0200)
commitcbfa71d689a193b7f327dceb6320ab09497757da
treeec8b64b10c82d1df6ef387aa72ec3d0f6bc9bfc8
parent7e6b3ad6930c2f1daa5c4831bbeda3fb931921e6
parentf7c5fd81516fb7b186c64c66dc080e1139586226
Merge commit 'f7c5fd81516fb7b186c64c66dc080e1139586226'

* commit 'f7c5fd81516fb7b186c64c66dc080e1139586226':
  resample: implement flushing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavresample/resample.c
tests/fate/libavresample.mak