Merge commit '13164e479f1c87829096c19003d2cc658ccc1fd4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 12:12:46 +0000 (14:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 12:24:09 +0000 (14:24 +0200)
commitc955525f724d8ea160ed174b6243ba7f4cadcc85
tree76994d18c1d227e9a88b7c558a4e36a0b80948e4
parentcbfa71d689a193b7f327dceb6320ab09497757da
parent13164e479f1c87829096c19003d2cc658ccc1fd4
Merge commit '13164e479f1c87829096c19003d2cc658ccc1fd4'

* commit '13164e479f1c87829096c19003d2cc658ccc1fd4':
  FATE: add tests for more resampling modes

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