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_null | |
| 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_null')
| -rw-r--r-- | tests/ref/lavfi/pixfmts_null | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null index 042f2d5518..d13af3d591 100644 --- a/tests/ref/lavfi/pixfmts_null +++ b/tests/ref/lavfi/pixfmts_null @@ -74,8 +74,26 @@ yuv444p16le 96a857dba8dc6792c58daec872825b32 yuv444p9be 07727e5c9040b7f0a17d591288ac330d yuv444p9le 4d12d20a68dc28618594c96c2ade4ff4 yuva420p 3a8c5c142e051367c196f95696e0e2c3 +yuva420p10be c15ea36665ebb6c6400b2817f8dc0959 +yuva420p10le ad2d0424033e7acbafa6d58f59b4487e +yuva420p16be 6afcf758f4b66c0b4173c942d42212d7 +yuva420p16le 13e195aa96329eb49921b6f9f07b875c +yuva420p9be bfbc86280eb417d53c3e09df1d6628b2 +yuva420p9le 78f5593bf51a31841ef83df41d0316eb yuva422p 45ae66d6f69fd5b77e6831e98d228bf4 +yuva422p10be 90ce250a517843b3e8a1ac0f4fdad733 +yuva422p10le c74cfda8934e3bf86940b7a08c809b35 +yuva422p16be c3f7354b6013b43439e02aa02be5fe69 +yuva422p16le a7ccc43820683ab15061d14cf8efce6c +yuva422p9be 14c55a16d19499b54b4341f135d3e558 +yuva422p9le a8bf168e5d2709222192d0aff46b1373 yuva444p 86b05da54db8c7e8cf5b6638e19c6fc5 +yuva444p10be bea827ff82f229145a016954120b731f +yuva444p10le c51b0554cfba0fabacf979683dceee95 +yuva444p16be 52a9591ec0d5059e49b1b2803f8582aa +yuva444p16le a9272ac197e4a4195662ce90f533976c +yuva444p9be f72f646ef07cdab613420585aba041ac +yuva444p9le 6d431b0a27bf4f86ea44ef5f14247a01 yuvj420p 73661456012f20cda81207b14bb0c0a5 yuvj422p aa97862b57f47c5a6506156e9aaf129a yuvj440p ff8b9884a49d546b035f5d2ac1e673df |