Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'

Browse Source 
* commit 'fe026ba960790a004adfcff33f44f96b05538e5c':
  drawtext: Drop stray guards

Conflicts:
	libavfilter/vf_drawtext.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
pull/144/head
Hendrik Leppkes 9 years ago
parent 00b5c19661 fe026ba960
commit 4eded225ad
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available