Skip to content

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

Merge commit 'e72e8c5a' 

* commit 'e72e8c5a':
  hevc: add hwaccel hooks

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_refs.c

See: b2e9b0f5Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2b5fa0e0 e72e8c5a
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