Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-28 00:03:35 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-03-28 00:09:17 +0400
commitf392949f1ac799ad1d7c1cda66e41c1670022d5a (patch)
treee3b97d59c99dfc21cf92abb7b71305f4e59f408a /Changelog
parent68014c6ed98b5c90f4dc211429dd269ac727be4b (diff)
parentae17878fb2ab100264226c84c58f5b95a703312f (diff)
Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f': BRender PIX image decoder Conflicts: doc/general.texi libavcodec/Makefile libavcodec/version.h See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others 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 022bb8a340..df087d6a36 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ version <next>:
- replaygain data export
- VP7 video decoder
- Alias PIX image encoder and decoder
+- Improvments to the BRender PIX image decoder
version 2.2: