diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-08 04:50:13 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-08 04:50:13 +0400 |
commit | c88caa522c41cd4108d39d8dd98805e867606ae3 (patch) | |
tree | 90eacfa0065bb907cd6543f5b2865d31d3d0a677 /tests | |
parent | db95e559f2b1c392295b09e8457d6f161eb5acdb (diff) | |
parent | a2031251c7eedd0d82cb9e08717990fa2ae6299f (diff) |
Merge remote branch 'qatar/master'
* qatar/master:
proto: include os_support.h in network.h
matroskaenc: don't write an empty Cues element.
lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
avio: move extern url_interrupt_cb declaration from avio.h to url.h
avio: make av_register_protocol2 internal.
avio: avio_ prefix for url_set_interrupt_cb.
avio: AVIO_ prefixes for URL_ open flags.
proto: introduce listen option in tcp
doc: clarify configure features
proto: factor ff_network_wait_fd and use it on udp
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ref/acodec/pcm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ref/acodec/pcm b/tests/ref/acodec/pcm index 1d876e4aca..033f8bc8c6 100644 --- a/tests/ref/acodec/pcm +++ b/tests/ref/acodec/pcm @@ -22,12 +22,12 @@ stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 1058444 ./tests/data/acodec/pcm_s16le.wav 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 -352a6bcf51d0f3ca4bf27c423a3d4d14 *./tests/data/acodec/pcm_s16be.mkv - 1060650 ./tests/data/acodec/pcm_s16be.mkv +af717ca95eaca310772eb1238c745d1b *./tests/data/acodec/pcm_s16be.mkv +1060638 ./tests/data/acodec/pcm_s16be.mkv 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 -2c089d83b2699c02c9358415e00a9707 *./tests/data/acodec/pcm_s16le.mkv - 1060650 ./tests/data/acodec/pcm_s16le.mkv +c4f51bf32fad2f7af8ea5beedb56168b *./tests/data/acodec/pcm_s16le.mkv +1060638 ./tests/data/acodec/pcm_s16le.mkv 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 07ffe7ffb78f3648b6524debdde5aec1 *./tests/data/acodec/pcm_s24be.mov |