Skip to content

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

Merge commit '9d86bfc2' 

* commit '9d86bfc2':
  hlsenc: Don't reset the number variable when wrapping

Conflicts:
	libavformat/hlsenc.c

See: 75b9fb27Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 50c08378 9d86bfc2
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