[FFmpeg-cvslog] Merge commit 'd5254230068e196a2496618c0d89cdfbc41f7478' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 10:46:52 2014 +0100| [3d05625136b6d52e012ee84ee47c73ff3dfdc68d] | committer: Michael Niedermayer

Merge commit 'd5254230068e196a2496618c0d89cdfbc41f7478' into release/2.2

* commit 'd5254230068e196a2496618c0d89cdfbc41f7478':
  Revert "Add libx265 encoder"

Conflicts:
	Changelog
	LICENSE
	configure
	doc/general.texi
	libavcodec/allcodecs.c
	libavcodec/libx265.c

Not merged, release branches should only contain bugfixes
a feature removial like this has to be discussed on ffmpeg-devel first

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d05625136b6d52e012ee84ee47c73ff3dfdc68d
---