* commit 'be7c3231':
  Add a libwebp encoder

Conflicts:
	Changelog
	doc/encoders.texi
	doc/general.texi
	libavcodec/version.h
	libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>