[FFmpeg-cvslog] Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 19 12:06:39 2013 +0200| [b26ccf218d933660c551832b4b14976b2acb3f0c] | committer: Michael Niedermayer

Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'

* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff':
  Add a WebP decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/img2.c

The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.

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

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