diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-21 02:46:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-21 03:40:53 +0100 |
| commit | 3be1a4ba9a9d926674b33051d6539fe8d8a4106c (patch) | |
| tree | c92779c80a98d94133dde283a86c4b4547dc16ab /tests/ref/lavfi/pixfmts_scale | |
| parent | 134aaa79f7f1ce1df64afc7d10d2b3de77df7b08 (diff) | |
| parent | 37c0dc626d2f8254ef623d987eb5077f9120755f (diff) | |
| download | ffmpeg-streaming-3be1a4ba9a9d926674b33051d6539fe8d8a4106c.zip ffmpeg-streaming-3be1a4ba9a9d926674b33051d6539fe8d8a4106c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: always align height by 32 pixel
raw: add 10bit YUV definitions
nut: support 10bit YUV
mpegvideo_enc: separate declarations and statements
oma: make header compile standalone
vp3: Reorder some functions to fix VP3 build with Theora disabled.
build: fix standalone compilation of ADX encoder
build: fix standalone compilation of ADPCM decoders
build: fix standalone compilation of mpc7/mpc8 decoders
4xm: Use bytestream2 functions to prevent overreads
bytestream: add a new set of bytestream functions with overread checking
mpegts: Suppress invalid timebase warnings on DMB streams.
mpegts: Fix typo in handling sections in the PMT.
vc1dec: Use the right pointer type for the tmp pointer
Conflicts:
libavcodec/4xm.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavfi/pixfmts_scale')
| -rw-r--r-- | tests/ref/lavfi/pixfmts_scale | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index 53ea7db..597904d 100644 --- a/tests/ref/lavfi/pixfmts_scale +++ b/tests/ref/lavfi/pixfmts_scale @@ -36,23 +36,23 @@ uyvy422 314bd486277111a95d9369b944fa0400 yuv410p 7df8f6d69b56a8dcb6c7ee908e5018b5 yuv411p 1143e7c5cc28fe0922b051b17733bc4c yuv420p fdad2d8df8985e3d17e73c71f713cb14 -yuv420p10be 6d335e75b553da590135cf8bb999610c -yuv420p10le d510ddbabefd03ef39ec943fcb51b709 +yuv420p10be 418039dbd82cf612db88417276aa0d1a +yuv420p10le ff7e5321208ab995b4f95634ebdf192b yuv420p16be 31988e9a5d6acacaa710f67bc1172f3a yuv420p16le f5390ce399f88e0e4e2621ed7833b250 yuv420p9be ec4983b7a949c0472110a7a2c58e278a yuv420p9le c136dce5913a722eee44ab72cff664b2 yuv422p 918e37701ee7377d16a8a6c119c56a40 -yuv422p10be cea7ca6b0e66d6f29539885896c88603 -yuv422p10le a10c4a5837547716f13cd61918b145f9 +yuv422p10be 315654908d50718e175aae018c484732 +yuv422p10le 91bbc78a9a56f659b55abc17722dcc09 yuv422p16be e7e34fe9264784763ab6cb406524c0f3 yuv422p16le c435b76b08204dda6908640fb5fd4621 yuv422p9be 82494823944912f73cebc58ad2979bbd yuv422p9le fc69c8a21f473916a4b4225636b97e06 yuv440p 461503fdb9b90451020aa3b25ddf041c yuv444p 81b2eba962d12e8d64f003ac56f6faf2 -yuv444p10be e9d3c8e744b8b0d8187ca092fa203fc9 -yuv444p10le 02f0a336e9da062a64df1ba487e102c5 +yuv444p10be fb304d77c6d2e18df5938662a22176f0 +yuv444p10le b17136913eb066dca6be6af645b9f7e8 yuv444p16be 0da9bed80f5542682ab286f3261cf24c yuv444p16le a0c5d3c7bf3f181db503cf8e450d1335 yuv444p9be 9ac2643ce7f7e5c4e17c8c9fd8494d4a |
