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)
* commit 'f7c5fd81516fb7b186c64c66dc080e1139586226':
  resample: implement flushing

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

Simple merge
Simple merge