Skip to content

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

Merge commit '92fdc80c' 

* commit '92fdc80c':
  nvenc: Fix NV12 input

Conflicts:
	libavcodec/nvenc.c

Not merged, the changed code is not in FFmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a4d76faf 92fdc80c
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