diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 15:50:32 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 15:50:32 +0000 |
| commit | f1e7c42f08d0370b8d47c2ca3d2c043d19d3fa8a (patch) | |
| tree | f182fa450129acacb0b5f6c5113ed03eab43666f /libavutil/opencl.c | |
| parent | 6a8d05cb4d1559e7246597150b836a78e419fdd1 (diff) | |
| parent | 225e84e74544062706c0159ec0737b0e1d40915f (diff) | |
| download | ffmpeg-f1e7c42f08d0370b8d47c2ca3d2c043d19d3fa8a.tar.gz | |
Merge commit '225e84e74544062706c0159ec0737b0e1d40915f'
* commit '225e84e74544062706c0159ec0737b0e1d40915f':
hls: disallow opening nested files in child demuxers
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/opencl.c')
0 files changed, 0 insertions, 0 deletions