diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 15:01:05 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 15:16:23 +0200 |
commit | d8cfa983580402787e06093da8d242cd92a74428 (patch) | |
tree | 484b8dbae1394060809c151944501773891948ad /doc/tablegen.txt | |
parent | c079da5073167b5e7e959af12ef157e71bde0015 (diff) | |
parent | 58b619c8a226cc4564ad5af291bc99a04f89ee56 (diff) | |
download | ffmpeg-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 'doc/tablegen.txt')
0 files changed, 0 insertions, 0 deletions