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,3 +1,3 @@
8854ea97f2d2172383941b001c69228b *./tests/data/lavf/lavf.wav
90158 ./tests/data/lavf/lavf.wav
c4afa6eafac5243aa1c202397789ccb8 *./tests/data/lavf/lavf.wav
90188 ./tests/data/lavf/lavf.wav
./tests/data/lavf/lavf.wav CRC=0xf1ae5536