Skip to content

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

Merge commit '11f3d5c6' 

* commit '11f3d5c6':
  hap: Name enums, remove unused struct member

Conflicts:
	libavcodec/hap.h

See: 440c26e9
See: d8488090Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents efa1e261 11f3d5c6
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