* commit '50ea9315':
  Add libx265 encoder

Conflicts:
	Changelog
	LICENSE
	configure
	libavcodec/allcodecs.c
	libavcodec/libx265.c
	libavcodec/version.h

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