Skip to content
Snippets Groups Projects
Commit 883bc7d2 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '55f03d87' 


* commit '55f03d87':
  hlsenc: Add parameter -hls_allow_cache

Conflicts:
	doc/muxers.texi
	libavformat/hlsenc.c
	libavformat/version.h

See: 3edb9aae
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents dd3bfe3c 55f03d87
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment