Merge commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97' into release/2.2

Browse Source

* commit 'bd4ad1a1d52b8882df016826b8bdcf7b1009cb97':
  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>

...

This commit is contained in:

Michael Niedermayer

2014-03-11 12:15:21 +01:00

parent 4a1e7a6fb7 bd4ad1a1d5

commit 3bfb7a2537

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