Applying: avformat/hlsenc: add hls_fmp4_init_refresh option
Using index info to reconstruct a base tree...
M	doc/muxers.texi
M	libavformat/hlsenc.c
Falling back to patching base and 3-way merge...
Auto-merging libavformat/hlsenc.c
CONFLICT (content): Merge conflict in libavformat/hlsenc.c
Auto-merging doc/muxers.texi
CONFLICT (content): Merge conflict in doc/muxers.texi
Patch failed at 0001 avformat/hlsenc: add hls_fmp4_init_refresh option
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".