diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 01:07:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 01:07:58 +0100 |
| commit | 0d6ae067660f6fbca524b9a77b857d3afc9f8030 (patch) | |
| tree | 0b5238e3778c5f188e83c4a0d821e7db2099ab24 | |
| parent | c0e3b461185cee5e8624337e75a263e74543e15d (diff) | |
| parent | ff48ae94f90f6862dbe5b1e7397a1bda3150e200 (diff) | |
| download | ffmpeg-0d6ae067660f6fbca524b9a77b857d3afc9f8030.tar.gz | |
Merge commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200'
* commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200':
hlsenc: remove the AVIOContext for the playlist from the muxer context
Conflicts:
libavformat/hlsenc.c
See: 28bf05e7b50e0920ff9ea4deded1fd1d7b817616
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions