summaryrefslogtreecommitdiff
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-22 11:53:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-22 11:53:41 +0100
commit6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd (patch)
tree6d894ef0fb24a5394ce4341e2404d6668f8d23f1 /Changelog
parent9b195dd5793edb88a72d53cb080c2216e91a5849 (diff)
parentbe7c323176e2e5fcf30e3d2ff20975b2f936811b (diff)
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@gmx.at>
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index 494feb5b64..dd68a01980 100644
--- a/Changelog
+++ b/Changelog
@@ -14,6 +14,7 @@ version <next>
- Windows resource files for shared libraries
- aeval filter
- stereoscopic 3d metadata handling
+- WebP encoding via libwebp
version 2.1: