Skip to content

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

Merge commit '21180b73' 

* commit '21180b73':
  avplay: Factorize code for adding filters to the filter pipeline

Conflicts:
	ffplay.c

See: 08c51e12Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 94f4bdc4 21180b73
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 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