summaryrefslogtreecommitdiff
path: root/libavcodec/webp.c
Commit message (Collapse)AuthorAge
* Merge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb'Michael Niedermayer2013-11-01
|\ | | | | | | | | | | | | * commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb': webp: stop using deprecated avcodec_set_dimensions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * webp: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |
* | Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'Michael Niedermayer2013-09-19
|/ | | | | | | | | | | | | | | | | | * 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>
* Add a WebP decoderJustin Ruggles2013-09-18
Container and lossy decoding by Aneesh Dogra <aneesh@sugarlabs.org> Lossless decoding by Justin Ruggles <justin.ruggles@gmail.com>