Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer

2013-09-19 12:06:39 +02:00

parent ac2fc63ac6 c4bfa09807

commit b26ccf218d

10 changed files with 1502 additions and 33 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1455

libavcodec/webp.c Normal file

File diff suppressed because it is too large Load Diff