diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-06-28 21:24:35 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-06-28 21:31:42 +0100 |
| commit | 842f463c7706671546a637a23ad9639aaac7b969 (patch) | |
| tree | d642afe790d3d8837c6fc5360f3f2cead81fef34 | |
| parent | d6cc6ac6b844ce0ea8c8e6383b940ca2a94c2993 (diff) | |
| download | ffmpeg-842f463c7706671546a637a23ad9639aaac7b969.tar.gz | |
fate: merge identical pixdesc_be/le tests
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rwxr-xr-x | configure | 1 | ||||
| -rwxr-xr-x | tests/lavfi-regression.sh | 2 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixdesc (renamed from tests/ref/lavfi/pixdesc_be) | 0 | ||||
| -rw-r--r-- | tests/ref/lavfi/pixdesc_le | 52 |
4 files changed, 1 insertions, 54 deletions
@@ -1592,7 +1592,6 @@ test_deps _muxer _demuxer \ ac3_fixed_test_deps="ac3_fixed_encoder ac3_decoder rm_muxer rm_demuxer" mpg_test_deps="mpeg1system_muxer mpegps_demuxer" -set_ne_test_deps pixdesc set_ne_test_deps pixfmts_copy set_ne_test_deps pixfmts_crop set_ne_test_deps pixfmts_hflip diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index 4a483e68a5..8942756697 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -69,7 +69,7 @@ do_lavfi_pixfmts "pad" "500:400:20:20" do_lavfi_pixfmts "scale" "200:100" do_lavfi_pixfmts "vflip" "" -if [ -n "$do_pixdesc_be" ] || [ -n "$do_pixdesc_le" ]; then +if [ -n "$do_pixdesc" ]; then pix_fmts="$($ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^IO' | cut -d' ' -f2 | sort)" for pix_fmt in $pix_fmts; do do_video_filter $pix_fmt "slicify=random,format=$pix_fmt,pixdesctest" -pix_fmt $pix_fmt diff --git a/tests/ref/lavfi/pixdesc_be b/tests/ref/lavfi/pixdesc index de13e94cff..de13e94cff 100644 --- a/tests/ref/lavfi/pixdesc_be +++ b/tests/ref/lavfi/pixdesc diff --git a/tests/ref/lavfi/pixdesc_le b/tests/ref/lavfi/pixdesc_le deleted file mode 100644 index de13e94cff..0000000000 --- a/tests/ref/lavfi/pixdesc_le +++ /dev/null @@ -1,52 +0,0 @@ -abgr 037bf9df6a765520ad6d490066bf4b89 -argb c442a8261c2265a07212ef0f72e35f5a -bgr24 0d0cb38ab3fa0b2ec0865c14f78b217b -bgr48be 4ba0ff7fc9e011ea264610ad1585bb1f -bgr48le d022bfdd6a07d5dcc693799322a386b4 -bgr4_byte 50d23cc82d9dcef2fd12adb81fb9b806 -bgr555be 49f01b1f1f0c84fd9e776dd34cc3c280 -bgr555le 378d6ac4223651a1adcbf94a3d0d807b -bgr565be 257cf78afa35dc31e9696f139c916715 -bgr565le 1dfdd03995c287e3c754b164bf26a355 -bgr8 24bd566170343d06fec6fccfff5abc54 -bgra 76a18a5151242fa137133f604cd624d2 -gray db08f7f0751900347e6b8649e4164d21 -gray16be 7becf34ae825a3df3969bf4c6bfeb5e2 -gray16le 10bd87059b5c189f3caef2837f4f2b5c -monob 668ebe8b8103b9046b251b2fa8a1d88f -monow 9251497f3b0634f1165d12d5a289d943 -nv12 e0af357888584d36eec5aa0f673793ef -nv21 9a3297f3b34baa038b1f37cb202b512f -rgb24 b41eba9651e1b5fe386289b506188105 -rgb48be 460b6de89b156290a12d3941db8bd731 -rgb48le cd93cb34d15996987367dabda3a10128 -rgb4_byte c93ba89b74c504e7f5ae9d9ab1546c73 -rgb555be 912a62c5e53bfcbac2a0340e10973cf2 -rgb555le a937a0fc764fb57dc1b3af87cba0273c -rgb565be 9cadf742e05ddc23a3b5b270f89aad3c -rgb565le d39aa298bb525e9be8860351c6f62dab -rgb8 4a9d8e4f2f154e83a7e1735be6300700 -rgba 93a5b3712e6eb8c5b9a09ffc7b9fbc12 -uyvy422 adcf64516a19fce44df77082bdb16291 -yuv410p 2d9225153c83ee1132397d619d94d1b3 -yuv411p 8b298af3e43348ca1b11eb8a3252ac6c -yuv420p eba2f135a08829387e2f698ff72a2939 -yuv420p10be 7605e266c088d0fcf68c7b27c3ceff5f -yuv420p10le 4228ee628c6deec123a13b9784516cc7 -yuv420p16be 16c009a235cd52b74791a895423152a3 -yuv420p16le 2d59c4f1d0314a5a957a7cfc4b6fabcc -yuv420p9be ce880fa07830e5297c22acf6e20555ce -yuv420p9le 16543fda8f87d94a6cf857d2e8d4461a -yuv422p c9bba4529821d796a6ab09f6a5fd355a -yuv422p16be 5499502e1c29534a158a1fe60e889f60 -yuv422p16le e3d61fde6978591596bc36b914386623 -yuv440p 5a064afe2b453bb52cdb3f176b1aa1cf -yuv444p 0a98447b78fd476aa39686da6a74fa2e -yuv444p16be ea602a24b8e6969679265078bd8607b6 -yuv444p16le 1262a0dc57ee147967fc896d04206313 -yuva420p a29884f3f3dfe1e00b961bc17bef3d47 -yuvj420p 32eec78ba51857b16ce9b813a49b7189 -yuvj422p 0dfa0ed434f73be51428758c69e082cb -yuvj440p 657501a28004e27a592757a7509f5189 -yuvj444p 98d3d054f2ec09a75eeed5d328dc75b7 -yuyv422 f2569f2b5069a0ee0cecae33de0455e3 |