[FFmpeg-cvslog] Merge commit 'aeaa108bafa11db290f1ada0e22dbfbd655cf2ba'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 15 17:55:36 2018 -0300| [061337a073236cb0bc6c56036f50f883d2887681] | committer: James Almer

Merge commit 'aeaa108bafa11db290f1ada0e22dbfbd655cf2ba'

* commit 'aeaa108bafa11db290f1ada0e22dbfbd655cf2ba':
  hls: Add a discontinuity marker on recover

This commit is a noop, see
572a8292cbded93c64110b872d2a8abadc92b741
6b95da9af91cd912561aa25593d6a41caa071963

Merged-by: James Almer <jamrial at gmail.com>

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