Skip to content

F
ffmpeg.wasm-core
Commit 0d6ae067 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit 'ff48ae94' 

* commit 'ff48ae94':
  hlsenc: remove the AVIOContext for the playlist from the muxer context

Conflicts:
	libavformat/hlsenc.c

See: 28bf05e7Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c0e3b461 ff48ae94
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
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