mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
883bc7d2e7
* commit '55f03d872640175a00bfa262da4652b7312b905f': hlsenc: Add parameter -hls_allow_cache Conflicts: doc/muxers.texi libavformat/hlsenc.c libavformat/version.h See: 3edb9aaea6aaa6b93d708693cfa6454c17e03732 Merged-by: Michael Niedermayer <michaelni@gmx.at>