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 /tests/ref/lavf | |
| 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 'tests/ref/lavf')
| -rw-r--r-- | tests/ref/lavf/wav | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/lavf/wav b/tests/ref/lavf/wav index bbbacc3b7e..cc8ec1d929 100644 --- a/tests/ref/lavf/wav +++ b/tests/ref/lavf/wav @@ -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 |