* commit '8a3d9ca6':
  libavcodec: Add an OpenH264 encoder wrapper

Conflicts:
	Changelog
	configure
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>