Merge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 17:19:15 +0000 (19:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 17:24:03 +0000 (19:24 +0200)
* commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f':
  resample: fix avresample_get_delay() return value

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

Simple merge