[FFmpeg-cvslog] Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 22 11:53:41 2013 +0100| [6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd] | committer: Michael Niedermayer

Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'

* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b':
  Add a libwebp encoder

Conflicts:
	Changelog
	doc/encoders.texi
	doc/general.texi
	libavcodec/version.h
	libavformat/img2enc.c

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

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