Merge commit '225e84e74544062706c0159ec0737b0e1d40915f'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 15:50:32 +0000 (15:50 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 15:50:32 +0000 (15:50 +0000)
commitf1e7c42f08d0370b8d47c2ca3d2c043d19d3fa8a
treef182fa450129acacb0b5f6c5113ed03eab43666f
parent6a8d05cb4d1559e7246597150b836a78e419fdd1
parent225e84e74544062706c0159ec0737b0e1d40915f
Merge commit '225e84e74544062706c0159ec0737b0e1d40915f'

* commit '225e84e74544062706c0159ec0737b0e1d40915f':
  hls: disallow opening nested files in child demuxers

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/hls.c