Skip to content

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

Merge commit '14ca0aa6' 

* commit '14ca0aa6':
  hevc: wait proper position for tmvp

Conflicts:
	libavcodec/hevc_mvs.c

See: ed248e7fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 17cbc645 14ca0aa6
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