aboutsummaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-17 15:01:05 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-17 15:16:23 +0200
commitd8cfa983580402787e06093da8d242cd92a74428 (patch)
tree484b8dbae1394060809c151944501773891948ad /Changelog
parentc079da5073167b5e7e959af12ef157e71bde0015 (diff)
parent58b619c8a226cc4564ad5af291bc99a04f89ee56 (diff)
downloadffmpeg-d8cfa983580402787e06093da8d242cd92a74428.tar.gz
Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'
* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56': wav muxer: write metadata Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog3
1 files changed, 2 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index 0864c3e335..c33ff481ac 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,7 @@
Entries are sorted chronologically from oldest to youngest within each release,
releases are sorted from youngest to oldest.
-version next:
+version <next>:
- stream disposition information printing in ffprobe
- filter for loudness analysis following EBU R128
@@ -12,6 +12,7 @@ version next:
- DTS-HD demuxer
- remove -same_quant, it hasn't worked for years
- X-Face image encoder and decoder
+- metadata (INFO tag) support in WAV muxer
version 1.0: