Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Oct 2012 13:01:05 +0000 (15:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Oct 2012 13:16:23 +0000 (15:16 +0200)
commitd8cfa983580402787e06093da8d242cd92a74428
tree484b8dbae1394060809c151944501773891948ad
parentc079da5073167b5e7e959af12ef157e71bde0015
parent58b619c8a226cc4564ad5af291bc99a04f89ee56
Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'

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

Conflicts:
Changelog
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavformat/version.h
libavformat/wav.c
tests/ref/fate/mapchan-6ch-extract-2
tests/ref/fate/mapchan-6ch-extract-2-downmix-mono
tests/ref/fate/mapchan-silent-mono
tests/ref/lavf/wav
tests/ref/seek/lavf_wav