falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c' 

* commit 'fe026ba960790a004adfcff33f44f96b05538e5c':
  drawtext: Drop stray guards

Conflicts:
	libavfilter/vf_drawtext.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
tags/n2.8
Hendrik Leppkes 10 years ago
parent
00b5c19661 fe026ba960
commit
4eded225ad
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available