Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'

Browse Source

* commit 'fe026ba960790a004adfcff33f44f96b05538e5c':
  drawtext: Drop stray guards

Conflicts:
	libavfilter/vf_drawtext.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

...

This commit is contained in:

Hendrik Leppkes

2015-08-05 12:15:41 +02:00

parent 00b5c19661 fe026ba960

commit 4eded225ad

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available