[FFmpeg-cvslog] Merge commit 'cc4c24208159200b7aff5b5c313903c7f23fa345'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Jan  2 10:13:58 2016 +0100| [d1262262de8402109cd5f1d6c4971d956c99f11e] | committer: Hendrik Leppkes

Merge commit 'cc4c24208159200b7aff5b5c313903c7f23fa345'

* commit 'cc4c24208159200b7aff5b5c313903c7f23fa345':
  avresample: Mark avresample_buffer() as pointer to const

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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