diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 23:45:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 23:45:00 +0200 |
| commit | de2cfb744a207cc09bc961c859d7ae91cb6192b4 (patch) | |
| tree | 0a78680e2bcacd76b6b16b2d39005f74aa76ae05 /tests/ref/acodec/pcm_alaw | |
| parent | 847943bc51098dbd68301099ed132cdde0f9eabf (diff) | |
| parent | 7d7b40f48a05af4483b31cdb8b4f1808b97b1f2f (diff) | |
| download | ffmpeg-de2cfb744a207cc09bc961c859d7ae91cb6192b4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcmenc: set correct bitrate value
avprobe: don't print format entry name when only one was requested
Conflicts:
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/acodec/pcm_alaw')
| -rw-r--r-- | tests/ref/acodec/pcm_alaw | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/acodec/pcm_alaw b/tests/ref/acodec/pcm_alaw index 4943831d39..0eba43a0c4 100644 --- a/tests/ref/acodec/pcm_alaw +++ b/tests/ref/acodec/pcm_alaw @@ -1,4 +1,4 @@ -ede2da07839a00c255a43129922f2c7b *./tests/data/acodec/pcm_alaw.wav +a2dd6a934ec6d5ec901a211652e85227 *./tests/data/acodec/pcm_alaw.wav 529258 ./tests/data/acodec/pcm_alaw.wav f323f7551ffad91de8613f44dcb198b6 *./tests/data/pcm_alaw.acodec.out.wav stddev: 101.67 PSNR: 56.19 MAXDIFF: 515 bytes: 1058400/ 1058400 |