Skip to content

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

Merge commit 'd00a504b' 

* commit 'd00a504b':
  libx265: Update API usage

Conflicts:
	libavcodec/libx265.c

See: d3736471Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a908de7f d00a504b
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