diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-29 04:08:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-29 05:23:12 +0200 |
| commit | bb9d5171a7352205ac9f09c970e24938fab57165 (patch) | |
| tree | 2abd874837de6e7cc0f21d1f84e13555b2eeb755 /tests/ref/lavfi/pixfmts_crop | |
| parent | dbe5f0172b4f123b15bc8ada82dd17b13c4bbbd7 (diff) | |
| parent | 4578435f35888c95b12a53a12cdab612ac3fef04 (diff) | |
| download | ffmpeg-bb9d5171a7352205ac9f09c970e24938fab57165.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
swscale: Add Doxygen for hyscale_fast/hScale.
fate: enable lavfi-pixmt tests on big endian systems
PPC: swscale: disable altivec functions for unsupported formats
fate: merge identical pixdesc_be/le tests
swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
build: call texi2pod.pl with full path instead of symlink
build: include sub-makefiles using full path instead of symlinks
swscale: update big endian reference values after dff5a835.
wavpack: skip blocks with no samples
cosmetics: remove outdated comment that is no longer true
build: replace some addprefix/addsuffix with substitution refs
avutil: Remove unused arbitrary precision integer code.
configure: Drop check for availability of ten assembler operands.
aacenc: Save channel configuration for later use.
aacenc: Fix codebook trellising for zeroed bands.
swscale: change prototypes of scaled YUV output functions.
swscale: re-add support for non-native endianness.
swscale: disentangle yuv2rgbX_c_full() into small functions.
swscale: split yuv2packed[12X]_c() remainders into small functions.
swscale: split yuv2packedX_altivec in smaller functions.
...
Conflicts:
Makefile
configure
libavcodec/x86/dsputil_mmx.c
libavfilter/Makefile
libavformat/Makefile
libavutil/integer.c
libavutil/integer.h
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/x86/swscale_template.c
tests/ref/lavfi/pixdesc_le
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavfi/pixfmts_crop')
| -rw-r--r-- | tests/ref/lavfi/pixfmts_crop | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/tests/ref/lavfi/pixfmts_crop b/tests/ref/lavfi/pixfmts_crop new file mode 100644 index 0000000000..af42cd3c4a --- /dev/null +++ b/tests/ref/lavfi/pixfmts_crop @@ -0,0 +1,42 @@ +abgr cd761690872843d1b7ab0c695393c751 +argb 2ec6ef18769bcd651c2e8904d5a3ee67 +bgr24 3450fd00cf1493d1ded75544d82ba3ec +bgr48be 90cb5d373a1123432d63c6a10c101afa +bgr48le 9371f54ceda9010f1199e86f4930ac3f +bgr4_byte 2f6ac3cdd4676ab4e2982bdf0664945b +bgr555be d3a7c273604723adeb7e5f5dd1c4272b +bgr555le d22442fc13b464f9ba455b08df4e981f +bgr565be fadceef4a64ad6873fcb43ddee0deb3c +bgr565le 891664e5a54ae5968901347da92bc5e9 +bgr8 4b7159e05765bd4703180072d86423c8 +bgra 395c9f706fccda721471acaa5c96c16c +gray 8c4850e66562a587a292dc728a65ea4a +gray16be daa5a6b98fb4a280c57c57bff1a2ab5a +gray16le 84f5ea7259073edcb893113b42213c8e +rgb24 3b90ed64b687d3dc186c6ef521dc71a8 +rgb48be a808128041a1962deaa8620c7448feba +rgb48le ce92d02cc322608d5be377cb1940677b +rgb4_byte 6958029f73c6cdfed4f71020d816f027 +rgb555be 41a7d1836837bc90f2cae19a9c9df3b3 +rgb555le eeb78f8ce6186fba55c941469e60ba67 +rgb565be b2d1cb525f3a0cfe27753c0d479b2fa9 +rgb565le 6a49700680be9a0d434411825a769556 +rgb8 88b0398c265d1ed7a837dc084fa0917c +rgba fd00b24c7597268c32759a84a1de2de4 +yuv410p a9f2eaa747bf988b7bebe4f442b9c67a +yuv411p 3334d3aef8dba238658090ac172375d1 +yuv420p bfea0188ddd4889787c403caae119cc7 +yuv420p16be 8365eff38b8c329aeb95fc605fa229bb +yuv420p16le 5e8dd38d973d5854abe1ad4efad20cc1 +yuv422p f2f930a91fe00d4252c4720b5ecd8961 +yuv422p16be 167e4338811a7d272925a4c6417d60da +yuv422p16le 3359395d5875d581fa1e975013d30114 +yuv440p 2472417d980e395ad6843cbb8b633b29 +yuv444p 1f151980486848c96bc5585ced99003e +yuv444p16be d69280c2856865d2ea94bd5292aac1c6 +yuv444p16le 33f43e030bedf9723be4f63c3e9fc80e +yuva420p 7536753dfbc7932560fb50c921369a0e +yuvj420p 21f891093006d42d7683b0e1d773a657 +yuvj422p 9a43d474c407590ad8f213880586b45e +yuvj440p 977351350450ebdbf7a9d20020c6b5a5 +yuvj444p 4a50ba26859dad91dcf7000de0d0efa1 |