[FFmpeg-cvslog] Merge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 11 19:19:15 2014 +0200| [c04961fa0ff63a87f07ba411f4f0a413a23ceea8] | committer: Michael Niedermayer

Merge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'

* commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f':
  resample: fix avresample_get_delay() return value

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c04961fa0ff63a87f07ba411f4f0a413a23ceea8
---