diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 16:37:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 16:37:22 +0200 |
| commit | 217f6c53e5c2d27dbe0d41eaea739c7cc6e5640b (patch) | |
| tree | 8f2a5b126f1c1a0ade4645e86ae9419b4a977f51 /doc/libavcodec.texi | |
| parent | fd601ba6b1c6a646aeb19839759644126316371e (diff) | |
| parent | 5a70a783f04919514efec7751d710b64d8975fd7 (diff) | |
| download | ffmpeg-217f6c53e5c2d27dbe0d41eaea739c7cc6e5640b.tar.gz | |
Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'
* commit '5a70a783f04919514efec7751d710b64d8975fd7':
hls: Add an option to prepend a baseurl to the playlist entries
Conflicts:
doc/muxers.texi
libavformat/hlsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/libavcodec.texi')
0 files changed, 0 insertions, 0 deletions