diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:41:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 17:47:36 +0100 |
| commit | a201639a01284003a055f195f4e850a0cf3fc2d5 (patch) | |
| tree | 959d66dc788f6d76941e646bbb49dea93209b231 /tests/ref/lavfi/pixfmts_vflip | |
| parent | 788afee86e283535f37fdcb649b2f180ad305f75 (diff) | |
| parent | 7658295ba353b8bedb3af904f46cfb1ba0cea86a (diff) | |
| download | ffmpeg-a201639a01284003a055f195f4e850a0cf3fc2d5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pixfmt: support more yuva formats
swscale: support gray to 9bit and 10bit formats
configure: rewrite print_config() function using awk
FATE: fix (AD)PCM test dependencies broken in e519990
Use ptrdiff_t instead of int for intra pred "stride" function parameter.
x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.
Conflicts:
libavcodec/h264pred.c
libavcodec/h264pred_template.c
libavutil/pixfmt.h
libswscale/swscale_unscaled.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavfi/pixfmts_vflip')
| -rw-r--r-- | tests/ref/lavfi/pixfmts_vflip | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip index 50a459dec0..45082f79ac 100644 --- a/tests/ref/lavfi/pixfmts_vflip +++ b/tests/ref/lavfi/pixfmts_vflip @@ -74,8 +74,26 @@ yuv444p16le 201e3acfa6f7628dfe2a1663de1128b1 yuv444p9be 6143c321929ade9e0bc93ddea926e936 yuv444p9le e43ba2026848ec803fabf74d77c10125 yuva420p dc8fd115eaf203a3eac351b92a7d8f18 +yuva420p10be 8dc20d4b654a82680dcb75391f1c8c28 +yuva420p10le f43a991e8b5fe7e192cf4e0dfee2b6cb +yuva420p16be b5c54895e87521f65a298d33bab5eb08 +yuva420p16le 95e208bc6644e23a2126ac5fca085f06 +yuva420p9be aa122367fc3fde822f812a4b878893f8 +yuva420p9le 4b57b8bd1534743f6740502c74bef385 yuva422p 6091f9c62a121c09eadb02e9173b2da2 +yuva422p10be 93b6afb2b1d1538b1c87caa040c43f4e +yuva422p10le 1c9359025ab8d257f0f5296e6b5a5787 +yuva422p16be 3fa019b3d5e6dcb7c8e338837b9cffe1 +yuva422p16le 871f244989e14f5d3eda45abb6b3dfd1 +yuva422p9be 923c816778f782ff8a56bcd1b14ef08d +yuva422p9le bd882d40af0369d9ef7891c8e7891024 yuva444p 9a55e83047abcc7a709f20805070135e +yuva444p10be 7ae88f488969b527c1348383c0d06ade +yuva444p10le 79a8dab388eb4d6cd12949b456ef5975 +yuva444p16be 4699a802e8ea3e74e968122980c0b0b0 +yuva444p16le 6f54a8cff38c54a235b92a0f1314e0aa +yuva444p9be 7472bb4b0c774d5d741035086d5e4330 +yuva444p9le ae11ddd5a3e8d69a36989f6f2a8897a1 yuvj420p 200b0332de9944e76c94d2e0699a5a2d yuvj422p a19a89ef145305cf224ef5aa247d075a yuvj440p 4240c9348d28af5f3edd0e642002bd2c |