Michael Niedermayer 73d5cf8f43 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  lavc: add a libwavpack encoder wrapper

Conflicts:
	Changelog
	doc/encoders.texi
	libavcodec/version.h

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

2013-06-11 09:36:34 +02:00

26 KiB

Raw Blame History

View Raw