Merge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6'

Browse Source

* commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6':
  lavfi: Add library identifier

Conflicts:
	libavfilter/version.h

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

...

This commit is contained in:

Michael Niedermayer 2015-07-01 03:40:45 +02:00

parent 818ff7ff5a 0d449c81b3

commit 9c010ba668

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

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

Diff Content Not Available