diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 00:54:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 01:03:07 +0200 |
| commit | a7758884db7eb3041b73d673c1ac3897609556b9 (patch) | |
| tree | fbf882650e3d0607bd189ae571e402b55179f078 /tests/ref | |
| parent | f7e797aa5c987c39b55666a2d41877ef2aec40bc (diff) | |
| parent | 0c378ea1f76e226eff460c84634e7227e3705372 (diff) | |
| download | ffmpeg-a7758884db7eb3041b73d673c1ac3897609556b9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtp: factorize dynamic payload type fallback
flvdec: Ignore the index if it's from a creator known to be different
cmdutils: move grow_array out of #if CONFIG_AVFILTER
avconv: actually set InputFile.rate_emu
ratecontrol: update last_qscale_for sooner
Fix unnecessary shift with 9/10bit vertical scaling
prores: mark prores as intra-only in libavformat/utils.c:is_intra_only()
prores: return more meaningful error values
prores: improve error message wording
prores: cosmetics: prettyprinting, drop useless parentheses
prores: lowercase AVCodec name entry
Conflicts:
cmdutils.c
libavcodec/proresdec_lgpl.c
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref')
| -rw-r--r-- | tests/ref/lavfi/pixfmts_scale | 12 | ||||
| -rw-r--r-- | tests/ref/vsynth1/dnxhd_720p_10bit | 4 | ||||
| -rw-r--r-- | tests/ref/vsynth2/dnxhd_720p_10bit | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index 281c8eb7ca..0210ca1dfe 100644 --- a/tests/ref/lavfi/pixfmts_scale +++ b/tests/ref/lavfi/pixfmts_scale @@ -31,15 +31,15 @@ uyvy422 314bd486277111a95d9369b944fa0400 yuv410p 7df8f6d69b56a8dcb6c7ee908e5018b5 yuv411p 1143e7c5cc28fe0922b051b17733bc4c yuv420p fdad2d8df8985e3d17e73c71f713cb14 -yuv420p10be dfa4d57bbc0e1a81f86a3895ab4feac0 -yuv420p10le af898206e757b0fca844a336f71d0091 +yuv420p10be 6d335e75b553da590135cf8bb999610c +yuv420p10le d510ddbabefd03ef39ec943fcb51b709 yuv420p16be 2a75942af24fbdc1fdfe189c6e7bf589 yuv420p16le c4264d92a7c273967a778f4f5daddbe3 -yuv420p9be 046091d96f2a78e224036f203d8c9601 -yuv420p9le c9abfffee99fcf5fcbfc5adcda14e4b4 +yuv420p9be ec4983b7a949c0472110a7a2c58e278a +yuv420p9le c136dce5913a722eee44ab72cff664b2 yuv422p 918e37701ee7377d16a8a6c119c56a40 -yuv422p10be 35206fcd7e00ee582a8c366b37d57d1d -yuv422p10le 396f930e2da02f149ab9dd5b781cbe8d +yuv422p10be cea7ca6b0e66d6f29539885896c88603 +yuv422p10le a10c4a5837547716f13cd61918b145f9 yuv422p16be 285993ee0c0f4f8e511ee46f93c5f38c yuv422p16le 61bfcee8e54465f760164f5a75d40b5e yuv440p 461503fdb9b90451020aa3b25ddf041c diff --git a/tests/ref/vsynth1/dnxhd_720p_10bit b/tests/ref/vsynth1/dnxhd_720p_10bit index cdab77c16a..ad97b66b7d 100644 --- a/tests/ref/vsynth1/dnxhd_720p_10bit +++ b/tests/ref/vsynth1/dnxhd_720p_10bit @@ -1,4 +1,4 @@ -cb29b6ae4e1562d95f9311991fef98df *./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd +b5e24a055af02edec8674333260214fd *./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd 2293760 ./tests/data/vsynth1/dnxhd-720p-10bit.dnxhd -2f45bb1af7da5dd3dca870ac87237b7d *./tests/data/dnxhd_720p_10bit.vsynth1.out.yuv +4466ff3d73d01bbe75ea25001d379b63 *./tests/data/dnxhd_720p_10bit.vsynth1.out.yuv stddev: 6.27 PSNR: 32.18 MAXDIFF: 64 bytes: 760320/ 7603200 diff --git a/tests/ref/vsynth2/dnxhd_720p_10bit b/tests/ref/vsynth2/dnxhd_720p_10bit index 81f53d8353..60c0d84a34 100644 --- a/tests/ref/vsynth2/dnxhd_720p_10bit +++ b/tests/ref/vsynth2/dnxhd_720p_10bit @@ -1,4 +1,4 @@ -8648511257afb816b5b911706ca391db *./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd +4b57da2c0c1280469ff3579f7151c227 *./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd 2293760 ./tests/data/vsynth2/dnxhd-720p-10bit.dnxhd -391b6f5aa7c7b488b479cb43d420b860 *./tests/data/dnxhd_720p_10bit.vsynth2.out.yuv +31a6aa8b8702e85fa3b48e73f035c4e4 *./tests/data/dnxhd_720p_10bit.vsynth2.out.yuv stddev: 1.35 PSNR: 45.46 MAXDIFF: 23 bytes: 760320/ 7603200 |