Skip to content

F
ffmpeg.wasm-core
Commit 4eded225 authored by Hendrik Leppkes's avatar Hendrik Leppkes
Browse files
Options

Merge commit 'fe026ba9' 

* commit 'fe026ba9':
  drawtext: Drop stray guards

Conflicts:
	libavfilter/vf_drawtext.c
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 00b5c196 fe026ba9
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