Merge commit '3fe26bb60858951710a42065c8183cce100d632a'

Browse Source

* commit '3fe26bb60858951710a42065c8183cce100d632a':
  hlsenc: write playlist into a temp file and replace the original atomically

Conflicts:
	libavformat/hlsenc.c

See: da97e4c64a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/113/head^2

Michael Niedermayer 10 years ago

parent e78a729163 3fe26bb608

commit f56f0e091f

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available