Skip to content

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

Merge commit '779e6c2b' 

* commit '779e6c2b':
  lavfi: add attribute_align_arg to all public entry points

Conflicts:
	libavfilter/buffersink.c

See: af2a196eMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8720d3ac 779e6c2b
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