Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Sep 2013 10:06:39 +0000 (12:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Sep 2013 10:36:11 +0000 (12:36 +0200)
commitb26ccf218d933660c551832b4b14976b2acb3f0c
tree149a7c27caf046cc105156d9e481cd7af651a90c
parentac2fc63ac6f938a4c995d87486013baffb5ca18a
parentc4bfa098072ba338d83555d6e2199f7e1e64ffff
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@gmx.at>
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/webp.c