summaryrefslogtreecommitdiff
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-10 13:06:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-10 13:06:16 +0100
commit9a714d871ac5c7dc6d35aec56caca0c5ede68fba (patch)
tree5fb2cf0b1f1c6c8c53231cf128654e3f1f918658 /Changelog
parentd80820655362645ae1c65d457287d7d12c04a44f (diff)
parentf5fac6f77752931347ab302563802dcaa49c2419 (diff)
downloadffmpeg-9a714d871ac5c7dc6d35aec56caca0c5ede68fba.tar.gz
Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419'
* commit 'f5fac6f77752931347ab302563802dcaa49c2419': asfdec: support reading ID3v2 tags in ASF files Conflicts: Changelog libavformat/asfdec.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 fa749a0814..f22ad18739 100644
--- a/Changelog
+++ b/Changelog
@@ -16,6 +16,7 @@ version <next>:
- histogram filter
- tee muxer
- il filter ported from libmpcodecs
+- support ID3v2 tags in ASF files
version 1.1: