diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:26:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:31:51 +0200 |
| commit | 1e49439f04f4aeb45344e8753094d00ac4b1a5d6 (patch) | |
| tree | 621f7e9cdf461b997ef614f6c9c4c5657089e471 /tests/ref/acodec/pcm-u16be | |
| parent | c01bcce4959a208a4f6b66fd527760ed45cd29bb (diff) | |
| parent | 6656370b858329ca07a60a2de954d5e90daa0206 (diff) | |
| download | ffmpeg-1e49439f04f4aeb45344e8753094d00ac4b1a5d6.tar.gz | |
Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'
* commit '6656370b858329ca07a60a2de954d5e90daa0206':
avconv: set the "encoder" tag when transcoding
Conflicts:
ffmpeg.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/acodec/pcm-u16be')
| -rw-r--r-- | tests/ref/acodec/pcm-u16be | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/acodec/pcm-u16be b/tests/ref/acodec/pcm-u16be index 4e758d7faa..3fb843dedb 100644 --- a/tests/ref/acodec/pcm-u16be +++ b/tests/ref/acodec/pcm-u16be @@ -1,4 +1,4 @@ -eab6206a2cec3c5a3be47fdaa826faff *tests/data/fate/acodec-pcm-u16be.nut -1060673 tests/data/fate/acodec-pcm-u16be.nut +3145c8429e13c6c438bb91db7b27323a *tests/data/fate/acodec-pcm-u16be.nut +1060710 tests/data/fate/acodec-pcm-u16be.nut 95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u16be.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 |