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/fate | |
| 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/fate')
| -rw-r--r-- | tests/ref/fate/mapchan-6ch-extract-2 | 4 | ||||
| -rw-r--r-- | tests/ref/fate/mapchan-6ch-extract-2-downmix-mono | 2 | ||||
| -rw-r--r-- | tests/ref/fate/mapchan-silent-mono | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/ref/fate/mapchan-6ch-extract-2 b/tests/ref/fate/mapchan-6ch-extract-2 index 98c854069c..3590bb8757 100644 --- a/tests/ref/fate/mapchan-6ch-extract-2 +++ b/tests/ref/fate/mapchan-6ch-extract-2 @@ -1,2 +1,2 @@ -6f091fe8c0be88c75921731dc9f74314 -5c2d162b9024329eb367295d37b8ca0a +40a98f34b1f34da59ff9d9ebf55654ad +9a252de5d38890c4bf52fd1f983a1865 diff --git a/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono b/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono index f42de0c954..aea3ae3455 100644 --- a/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono +++ b/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono @@ -1 +1 @@ -959645ed73e6d08d8f1e947eac5d0b92 +339a7c7c67b96df0aac636adc852a3a9 diff --git a/tests/ref/fate/mapchan-silent-mono b/tests/ref/fate/mapchan-silent-mono index a867e3b432..d3d032e674 100644 --- a/tests/ref/fate/mapchan-silent-mono +++ b/tests/ref/fate/mapchan-silent-mono @@ -1 +1 @@ -4f5148f08587a4b9794aa52aec7852ac +60ebd29f1ee6b700392969083016560c |