Skip to content

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

Merge commit '6503cbf8' 

* commit '6503cbf8':
  ffv1enc: Add const attribute to input frame

Conflicts:
	libavcodec/ffv1.h

no change, the changed field does not exist in FFmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c9ac9adb 6503cbf8
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