Merge commit '4c41a7a1798dd6c60e40f79be12faa98a9347151'

Browse Source

* commit '4c41a7a1798dd6c60e40f79be12faa98a9347151':
  vf_frei0r: fix missing end of line character

Conflicts:
	libavfilter/vf_frei0r.c

No change as the token parsing change was not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/293/head

Michael Niedermayer 11 years ago

parent 4a59994e03 4c41a7a179

commit adaba6a108

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