Michael Niedermayer e15e78f391 Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89' ...

* commit '1316df7aa98c4784f190d107206d0bb12c590b89':
  lavu: add an API function to return the Libav version string

Conflicts:
	.gitignore
	Makefile
	cmdutils.c
	doc/APIchanges
	libavutil/avutil.h
	libavutil/utils.c

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

2015-07-03 03:22:48 +02:00

1.4 KiB

Raw Blame History

View Raw