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 | |
| parent | 134aaa79f7f1ce1df64afc7d10d2b3de77df7b08 (diff) | |
| parent | 37c0dc626d2f8254ef623d987eb5077f9120755f (diff) | |
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')
| -rw-r--r-- | tests/ref/lavfi/pixdesc | 12 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_copy | 12 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_null | 12 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_scale | 12 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixfmts_vflip | 12 |
5 files changed, 30 insertions, 30 deletions
diff --git a/tests/ref/lavfi/pixdesc b/tests/ref/lavfi/pixdesc index 63e2980dcc..07d1d36417 100644 --- a/tests/ref/lavfi/pixdesc +++ b/tests/ref/lavfi/pixdesc @@ -35,23 +35,23 @@ uyvy422 adcf64516a19fce44df77082bdb16291 yuv410p 2d9225153c83ee1132397d619d94d1b3 yuv411p 8b298af3e43348ca1b11eb8a3252ac6c yuv420p eba2f135a08829387e2f698ff72a2939 -yuv420p10be ea2aee509286fa3d07a6c68fec9967a5 -yuv420p10le 645ef73e06de41c83a7bc724179d2ce3 +yuv420p10be 2f88c301feeaccd2a5fb55f54fc30be9 +yuv420p10le 93f175084af4e78f97c7710e505f3057 yuv420p16be ba858ff4246368c28f03152487f57ef3 yuv420p16le de239729a4fe1d4cfa3743e006654e78 yuv420p9be 64e36fd90573f67ac2006d103972a79b yuv420p9le 9ed4b1dfabc53fd9e586ff6c4c43af80 yuv422p c9bba4529821d796a6ab09f6a5fd355a -yuv422p10be bdc13b630fd668b34c6fe1aae28dfc71 -yuv422p10le d0607c260a45c973e6639f4e449730ad +yuv422p10be 11af7dfafe8bc025c7e3bd82b830fe8a +yuv422p10le ec04efb76efa79bf0d02b21572371a56 yuv422p16be 5499502e1c29534a158a1fe60e889f60 yuv422p16le e3d61fde6978591596bc36b914386623 yuv422p9be 29b71579946940a8c00fa844c9dff507 yuv422p9le 062b7f9cbb972bf36b5bdb1a7623701a yuv440p 5a064afe2b453bb52cdb3f176b1aa1cf yuv444p 0a98447b78fd476aa39686da6a74fa2e -yuv444p10be e65cbae7e4f1892c23defbc8e8052cf6 -yuv444p10le 767179dd82846cf00ee4c340c9c1ab74 +yuv444p10be 71be185a2fb7a353eb024df9bc63212d +yuv444p10le c1c6b30a12065c7901c0a267e4861a0f yuv444p16be 1c6ea2c2f5e539006112ceec3d4e7d90 yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 diff --git a/tests/ref/lavfi/pixfmts_copy b/tests/ref/lavfi/pixfmts_copy index 3a638c33c2..5ced4785c8 100644 --- a/tests/ref/lavfi/pixfmts_copy +++ b/tests/ref/lavfi/pixfmts_copy @@ -36,23 +36,23 @@ uyvy422 adcf64516a19fce44df77082bdb16291 yuv410p 2d9225153c83ee1132397d619d94d1b3 yuv411p 8b298af3e43348ca1b11eb8a3252ac6c yuv420p eba2f135a08829387e2f698ff72a2939 -yuv420p10be ea2aee509286fa3d07a6c68fec9967a5 -yuv420p10le 645ef73e06de41c83a7bc724179d2ce3 +yuv420p10be 2f88c301feeaccd2a5fb55f54fc30be9 +yuv420p10le 93f175084af4e78f97c7710e505f3057 yuv420p16be ba858ff4246368c28f03152487f57ef3 yuv420p16le de239729a4fe1d4cfa3743e006654e78 yuv420p9be 64e36fd90573f67ac2006d103972a79b yuv420p9le 9ed4b1dfabc53fd9e586ff6c4c43af80 yuv422p c9bba4529821d796a6ab09f6a5fd355a -yuv422p10be bdc13b630fd668b34c6fe1aae28dfc71 -yuv422p10le d0607c260a45c973e6639f4e449730ad +yuv422p10be 11af7dfafe8bc025c7e3bd82b830fe8a +yuv422p10le ec04efb76efa79bf0d02b21572371a56 yuv422p16be 5499502e1c29534a158a1fe60e889f60 yuv422p16le e3d61fde6978591596bc36b914386623 yuv422p9be 29b71579946940a8c00fa844c9dff507 yuv422p9le 062b7f9cbb972bf36b5bdb1a7623701a yuv440p 5a064afe2b453bb52cdb3f176b1aa1cf yuv444p 0a98447b78fd476aa39686da6a74fa2e -yuv444p10be e65cbae7e4f1892c23defbc8e8052cf6 -yuv444p10le 767179dd82846cf00ee4c340c9c1ab74 +yuv444p10be 71be185a2fb7a353eb024df9bc63212d +yuv444p10le c1c6b30a12065c7901c0a267e4861a0f yuv444p16be 1c6ea2c2f5e539006112ceec3d4e7d90 yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null index 3a638c33c2..5ced4785c8 100644 --- a/tests/ref/lavfi/pixfmts_null +++ b/tests/ref/lavfi/pixfmts_null @@ -36,23 +36,23 @@ uyvy422 adcf64516a19fce44df77082bdb16291 yuv410p 2d9225153c83ee1132397d619d94d1b3 yuv411p 8b298af3e43348ca1b11eb8a3252ac6c yuv420p eba2f135a08829387e2f698ff72a2939 -yuv420p10be ea2aee509286fa3d07a6c68fec9967a5 -yuv420p10le 645ef73e06de41c83a7bc724179d2ce3 +yuv420p10be 2f88c301feeaccd2a5fb55f54fc30be9 +yuv420p10le 93f175084af4e78f97c7710e505f3057 yuv420p16be ba858ff4246368c28f03152487f57ef3 yuv420p16le de239729a4fe1d4cfa3743e006654e78 yuv420p9be 64e36fd90573f67ac2006d103972a79b yuv420p9le 9ed4b1dfabc53fd9e586ff6c4c43af80 yuv422p c9bba4529821d796a6ab09f6a5fd355a -yuv422p10be bdc13b630fd668b34c6fe1aae28dfc71 -yuv422p10le d0607c260a45c973e6639f4e449730ad +yuv422p10be 11af7dfafe8bc025c7e3bd82b830fe8a +yuv422p10le ec04efb76efa79bf0d02b21572371a56 yuv422p16be 5499502e1c29534a158a1fe60e889f60 yuv422p16le e3d61fde6978591596bc36b914386623 yuv422p9be 29b71579946940a8c00fa844c9dff507 yuv422p9le 062b7f9cbb972bf36b5bdb1a7623701a yuv440p 5a064afe2b453bb52cdb3f176b1aa1cf yuv444p 0a98447b78fd476aa39686da6a74fa2e -yuv444p10be e65cbae7e4f1892c23defbc8e8052cf6 -yuv444p10le 767179dd82846cf00ee4c340c9c1ab74 +yuv444p10be 71be185a2fb7a353eb024df9bc63212d +yuv444p10le c1c6b30a12065c7901c0a267e4861a0f yuv444p16be 1c6ea2c2f5e539006112ceec3d4e7d90 yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index 53ea7db703..597904d02c 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 diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip index ce613debe5..333bd46484 100644 --- a/tests/ref/lavfi/pixfmts_vflip +++ b/tests/ref/lavfi/pixfmts_vflip @@ -36,23 +36,23 @@ uyvy422 ffbd36720c77398d9a0d03ce2625928f yuv410p 7bfb39d7afb49d6a6173e6b23ae321eb yuv411p 4a90048cc3a65fac150e53289700efe1 yuv420p 2e6d6062e8cad37fb3ab2c433b55f382 -yuv420p10be fac8e0ae5a81861cddac97ddc4100b66 -yuv420p10le cb83ed3552113e0292e30adee774359c +yuv420p10be 7ce787a888381dd46b0212c099ecaad9 +yuv420p10le bf22a1c543a7b3dbc556a0eb9592e179 yuv420p16be b6d25ba55bc1831d352f379311b42b6d yuv420p16le 1d7ef427b6f79a02b93948738dab5442 yuv420p9be 9865bf5c4392b56b1c4eb4f5a3fd32f9 yuv420p9le 0f1e371a1374d3cba2205b70cc7cac90 yuv422p d7f5cb44d9b0210d66d6a8762640ab34 -yuv422p10be 588fe319b96513c32e21d3e32b45447f -yuv422p10le 11b57f2bd9661024153f3973b9090cdb +yuv422p10be 0be8378c3773e1c0b394315ef4994351 +yuv422p10le 6518094fe8de6bee95af21af1e5dc1e1 yuv422p16be 9bd8f8c961822b586fa4cf992be54acc yuv422p16le 9c4a1239605c7952b736ac3130163f14 yuv422p9be 7c6f1e140b3999ee7d923854e507752a yuv422p9le 51f10d79c07989060dd06e767e6d7d60 yuv440p 876385e96165acf51271b20e5d85a416 yuv444p 9c3c667d1613b72d15bc6d851c5eb8f7 -yuv444p10be 944a4997c4edb3a8dd0f0493cfd5a1fd -yuv444p10le 2d0947ae89ecc6a501eee6832cb27e06 +yuv444p10be ee069cc6db48975eb029d72f889a7fe6 +yuv444p10le 645b3335248113cafe3c29edb1d7f3be yuv444p16be de2dedfc6f12073ffead113f86e07ecf yuv444p16le 8e83323cf102d6c823a03ae8a7b7e033 yuv444p9be 6ac92b7dc9ab2fc59bee99204886899a |