Merge commit 'aeaa108bafa11db290f1ada0e22dbfbd655cf2ba'
authorJames Almer <jamrial@gmail.com>
Thu, 15 Mar 2018 20:55:36 +0000 (17:55 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 15 Mar 2018 20:55:36 +0000 (17:55 -0300)
commit061337a073236cb0bc6c56036f50f883d2887681
tree1e885ea6493b5a263f138d5e3f203ea7df283571
parent1dd7bb978436e9064e92411693252ad4ad183435
parentaeaa108bafa11db290f1ada0e22dbfbd655cf2ba
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@gmail.com>