[FFmpeg-cvslog] Merge commit '225e84e74544062706c0159ec0737b0e1d40915f'

Derek Buitenhuis git at videolan.org
Mon Feb 29 16:52:01 CET 2016


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Feb 29 15:50:32 2016 +0000| [f1e7c42f08d0370b8d47c2ca3d2c043d19d3fa8a] | committer: Derek Buitenhuis

Merge commit '225e84e74544062706c0159ec0737b0e1d40915f'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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





More information about the ffmpeg-cvslog mailing list