Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'

* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56':
  wav muxer: write metadata

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-17 15:01:05 +02:00
8 changed files with 28 additions and 24 deletions

View File

@@ -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: