diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-11 02:23:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-11 02:44:43 +0100 |
| commit | 0e7fc3cafe838b32c3af73954acf9de2f9240ffd (patch) | |
| tree | f0c534b98818c2712dbeed7f08b4ba831e0de23d /tests/ref/vsynth2 | |
| parent | a9bd29e15e8d4ab4afaba7c31ebc0063c1df2db9 (diff) | |
| parent | 9472d37d8e137df1e78e973b8b0e0d5607a799d5 (diff) | |
| download | ffmpeg-0e7fc3cafe838b32c3af73954acf9de2f9240ffd.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
rv34: frame-level multi-threading
mpegvideo: claim ownership of referenced pictures
aacsbr: prevent out of bounds memcpy().
ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM
sierravmd: fix audio pts
bethsoftvideo: Use bytestream2 functions to prevent buffer overreads.
bmpenc: support for PIX_FMT_RGB444
swscale: fix crash in fast_bilinear code when compiled with -mred-zone.
swscale: specify register type.
rv34: use get_bits_left()
avconv: reinitialize the filtergraph on resolution change.
vsrc_buffer: error on changing frame parameters.
avconv: fix -copyinkf.
fate: Update file checksums after the mov muxer change in a78dbada55d6
movenc: Don't store a nonzero creation time if nothing was set by the caller
bmpdec: support for rgb444 with bitfields compression
rgb2rgb: allow conversion for <15 bpp
doc: fix stray reference to FFmpeg
v4l2: use C99 struct initializer
v4l2: poll the file descriptor
...
Conflicts:
avconv.c
libavcodec/aacsbr.c
libavcodec/bethsoftvideo.c
libavcodec/kmvc.c
libavdevice/v4l2.c
libavfilter/vsrc_buffer.c
libswscale/swscale_unscaled.c
libswscale/x86/input.asm
tests/ref/acodec/alac
tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8
tests/ref/lavf/mov
tests/ref/vsynth1/dnxhd_1080i
tests/ref/vsynth1/mpeg4
tests/ref/vsynth1/qtrle
tests/ref/vsynth1/svq1
tests/ref/vsynth2/dnxhd_1080i
tests/ref/vsynth2/mpeg4
tests/ref/vsynth2/qtrle
tests/ref/vsynth2/svq1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth2')
| -rw-r--r-- | tests/ref/vsynth2/dnxhd_1080i | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/mpeg4 | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/prores | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/qtrle | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/qtrlegray | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/svq1 | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/ref/vsynth2/dnxhd_1080i b/tests/ref/vsynth2/dnxhd_1080i index 79563be6d1..04c593f53d 100644 --- a/tests/ref/vsynth2/dnxhd_1080i +++ b/tests/ref/vsynth2/dnxhd_1080i @@ -1,4 +1,4 @@ -af3b282a2194a7e2748df7684330728a *./tests/data/vsynth2/dnxhd-1080i.mov +677588203650770792b63a66231bd127 *./tests/data/vsynth2/dnxhd-1080i.mov 3031895 ./tests/data/vsynth2/dnxhd-1080i.mov 3c559af629ae0a8fb1a9a0e4b4da7733 *./tests/data/dnxhd_1080i.vsynth2.out.yuv stddev: 1.31 PSNR: 45.77 MAXDIFF: 23 bytes: 760320/ 7603200 diff --git a/tests/ref/vsynth2/mpeg4 b/tests/ref/vsynth2/mpeg4 index 726e1d9436..e201df8501 100644 --- a/tests/ref/vsynth2/mpeg4 +++ b/tests/ref/vsynth2/mpeg4 @@ -1,4 +1,4 @@ -4d092ca067362a61b9c96f5f12a1ab5a *./tests/data/vsynth2/odivx.mp4 +051ff85797971b9047723044eaec07be *./tests/data/vsynth2/odivx.mp4 119649 ./tests/data/vsynth2/odivx.mp4 90a3577850239083a9042bef33c50e85 *./tests/data/mpeg4.vsynth2.out.yuv stddev: 5.34 PSNR: 33.57 MAXDIFF: 83 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/prores b/tests/ref/vsynth2/prores index 88042601ec..7bbe907b3a 100644 --- a/tests/ref/vsynth2/prores +++ b/tests/ref/vsynth2/prores @@ -1,4 +1,4 @@ -85f16a09120b668d02cb9cce86dfa9b1 *./tests/data/vsynth2/prores.mov +81988143e6169dbf735bd180bf5a8703 *./tests/data/vsynth2/prores.mov 2844034 ./tests/data/vsynth2/prores.mov b5844025c0f4c7c37db702c3213db232 *./tests/data/prores.vsynth2.out.yuv stddev: 1.31 PSNR: 45.77 MAXDIFF: 11 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/qtrle b/tests/ref/vsynth2/qtrle index c4cd88729c..4946dd6976 100644 --- a/tests/ref/vsynth2/qtrle +++ b/tests/ref/vsynth2/qtrle @@ -1,4 +1,4 @@ -f18ed8321e19a7cadedc3ba32d71e0ea *./tests/data/vsynth2/qtrle.mov +04c58848958a0684eba8a816e00dba28 *./tests/data/vsynth2/qtrle.mov 14798259 ./tests/data/vsynth2/qtrle.mov 98d0e2854731472c5bf13d8638502d0a *./tests/data/qtrle.vsynth2.out.yuv stddev: 1.26 PSNR: 46.10 MAXDIFF: 13 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/qtrlegray b/tests/ref/vsynth2/qtrlegray index 4d97adce60..1ffdb5bee4 100644 --- a/tests/ref/vsynth2/qtrlegray +++ b/tests/ref/vsynth2/qtrlegray @@ -1,4 +1,4 @@ -799451fc6215c51fc892a2284721b8e7 *./tests/data/vsynth2/qtrlegray.mov +b9769bd1ff7e3b0fb26dfc7555e789b4 *./tests/data/vsynth2/qtrlegray.mov 5111257 ./tests/data/vsynth2/qtrlegray.mov f63b5ebdfdba750e547c25131b0a3fd1 *./tests/data/qtrlegray.vsynth2.out.yuv stddev: 19.42 PSNR: 22.36 MAXDIFF: 72 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/svq1 b/tests/ref/vsynth2/svq1 index b8ce85250c..77c55c10ee 100644 --- a/tests/ref/vsynth2/svq1 +++ b/tests/ref/vsynth2/svq1 @@ -1,4 +1,4 @@ -8d5275bf59aac368d5da11d9c34b8cf2 *./tests/data/vsynth2/svq1.mov +320a7fbbaecc0989df054bf9678bfdf6 *./tests/data/vsynth2/svq1.mov 766691 ./tests/data/vsynth2/svq1.mov aa03471dac3f49455a33a2b19fda1098 *./tests/data/svq1.vsynth2.out.yuv stddev: 3.23 PSNR: 37.93 MAXDIFF: 61 bytes: 7603200/ 7603200 |