[FFmpeg-cvslog] Merge commit 'e17567a831dede1f24e3a1a4c305a93012d7a8ce'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  1 11:30:55 2017 +0200| [c1476219cad048685a29ce8d6bcc2b58d94abaef] | committer: Clément Bœsch

Merge commit 'e17567a831dede1f24e3a1a4c305a93012d7a8ce'

* commit 'e17567a831dede1f24e3a1a4c305a93012d7a8ce':
  libilbc: support for latest git of libilbc

This commit is a noop, see 59af5383c18c8cf3fe2a4b5cc1ebf2f3300bdfe5

Merged-by: Clément Bœsch <u at pkh.me>

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