diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 15:21:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 15:54:36 +0100 |
| commit | 002ad7cd3901fe6e022f5f542d36e327bdbd7f50 (patch) | |
| tree | 63341faa2457aa8a694ff4b5f11b7ac06e1f90cb /tests/ref/fate/filter-delogo | |
| parent | 397fafad230a7d4f2d2c0908ae56418318e82148 (diff) | |
| parent | 0a837b631757a7407df038248eea5e9e79b1cb79 (diff) | |
| download | ffmpeg-002ad7cd3901fe6e022f5f542d36e327bdbd7f50.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
fate: update ref after rv30_loop_filter fix
rv30: fix masking in rv30_loop_filter()
libcdio: support recent cdio-paranoia
theora: Skip zero-sized headers
h264: add 3 pixels below for subpixel filter wait position
h264: fix ff_generate_sliding_window_mmcos() prototype.
h264: don't clobber mmco opcode tables for non-first slice headers.
Conflicts:
configure
libavcodec/h264_refs.c
tests/ref/fate/filter-delogo
tests/ref/fate/rv30
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/filter-delogo')
| -rw-r--r-- | tests/ref/fate/filter-delogo | 164 |
1 files changed, 82 insertions, 82 deletions
diff --git a/tests/ref/fate/filter-delogo b/tests/ref/fate/filter-delogo index e0f24cd8ce..bc58777304 100644 --- a/tests/ref/fate/filter-delogo +++ b/tests/ref/fate/filter-delogo @@ -8,13 +8,13 @@ 0, 6, 6, 1, 126720, 0x94a0f126 0, 7, 7, 1, 126720, 0x0250f106 0, 8, 8, 1, 126720, 0xcf6ab4bc -0, 9, 9, 1, 126720, 0x44aeb57c -0, 10, 10, 1, 126720, 0x33b0b5bc -0, 11, 11, 1, 126720, 0xc4bab591 +0, 9, 9, 1, 126720, 0x429eb57c +0, 10, 10, 1, 126720, 0x3bf0b5bc +0, 11, 11, 1, 126720, 0xcaedb591 0, 12, 12, 1, 126720, 0xa492b5ec -0, 13, 13, 1, 126720, 0x1459b85c -0, 14, 14, 1, 126720, 0x806fb8dc -0, 15, 15, 1, 126720, 0xd241b871 +0, 13, 13, 1, 126720, 0x2431b85c +0, 14, 14, 1, 126720, 0x8283b8dc +0, 15, 15, 1, 126720, 0xd71bb871 0, 16, 16, 1, 126720, 0x698eb5cc 0, 17, 17, 1, 126720, 0x4719aa98 0, 18, 18, 1, 126720, 0x9ca1962c @@ -28,83 +28,83 @@ 0, 26, 26, 1, 126720, 0x7af2ea86 0, 27, 27, 1, 126720, 0x40d4b4eb 0, 28, 28, 1, 126720, 0x49d00307 -0, 29, 29, 1, 126720, 0x44c8848e -0, 30, 30, 1, 126720, 0xc6990101 -0, 31, 31, 1, 126720, 0x2e01b963 +0, 29, 29, 1, 126720, 0x0654849c +0, 30, 30, 1, 126720, 0xe46d0107 +0, 31, 31, 1, 126720, 0xa483b963 0, 32, 32, 1, 126720, 0xd0e903f0 -0, 33, 33, 1, 126720, 0x3457d592 -0, 34, 34, 1, 126720, 0x4f1ddb3c -0, 35, 35, 1, 126720, 0x3980ace5 +0, 33, 33, 1, 126720, 0x964ed592 +0, 34, 34, 1, 126720, 0x23fbdb3c +0, 35, 35, 1, 126720, 0x59fdace5 0, 36, 36, 1, 126720, 0xb1e37954 -0, 37, 37, 1, 126720, 0x619fc554 -0, 38, 38, 1, 126720, 0x945fb39e -0, 39, 39, 1, 126720, 0xb1d5e0ce +0, 37, 37, 1, 126720, 0x8ed9c554 +0, 38, 38, 1, 126720, 0xe3c4b39f +0, 39, 39, 1, 126720, 0xfd17e0ce 0, 40, 40, 1, 126720, 0xf26e1dcc -0, 41, 41, 1, 126720, 0x04d5783e -0, 42, 42, 1, 126720, 0xbaa0479e -0, 43, 43, 1, 126720, 0x20d88b01 +0, 41, 41, 1, 126720, 0x13cc783c +0, 42, 42, 1, 126720, 0x47ad47a1 +0, 43, 43, 1, 126720, 0x427c8b0d 0, 44, 44, 1, 126720, 0x59d99901 -0, 45, 45, 1, 126720, 0x1c6e09f6 -0, 46, 46, 1, 126720, 0xeec50fc5 -0, 47, 47, 1, 126720, 0xb3a92827 -0, 48, 48, 1, 126720, 0xf62dd2b6 -0, 49, 49, 1, 126720, 0x75b1e619 -0, 50, 50, 1, 126720, 0x6bbce2c0 -0, 51, 51, 1, 126720, 0xd93e023c -0, 52, 52, 1, 126720, 0xbbe8e7c2 -0, 53, 53, 1, 126720, 0x2272ec17 -0, 54, 54, 1, 126720, 0xf5e4ee6e -0, 55, 55, 1, 126720, 0x751d2607 -0, 56, 56, 1, 126720, 0x44c499c9 -0, 57, 57, 1, 126720, 0xddccd842 -0, 58, 58, 1, 126720, 0x508dd214 -0, 59, 59, 1, 126720, 0x8eb10272 -0, 60, 60, 1, 126720, 0x7224b1c6 -0, 61, 61, 1, 126720, 0x50ff456c -0, 62, 62, 1, 126720, 0xa81e2731 -0, 63, 63, 1, 126720, 0x7e50456d -0, 64, 64, 1, 126720, 0x44802978 -0, 65, 65, 1, 126720, 0x86e88743 -0, 66, 66, 1, 126720, 0x0b1087d6 -0, 67, 67, 1, 126720, 0xb0227d21 -0, 68, 68, 1, 126720, 0x29d10bd2 -0, 69, 69, 1, 126720, 0x04b43afa -0, 70, 70, 1, 126720, 0xb48e9698 -0, 71, 71, 1, 126720, 0x75d760fb -0, 72, 72, 1, 126720, 0xa2ab1fdb -0, 73, 73, 1, 126720, 0xec30a5ee -0, 74, 74, 1, 126720, 0xbdab7c8c -0, 75, 75, 1, 126720, 0xac5c3f2c -0, 76, 76, 1, 126720, 0xce6350be -0, 77, 77, 1, 126720, 0xb109657a -0, 78, 78, 1, 126720, 0x723865a4 -0, 79, 79, 1, 126720, 0xa9869124 -0, 80, 80, 1, 126720, 0xc41af558 -0, 81, 81, 1, 126720, 0xcbe6a402 -0, 82, 82, 1, 126720, 0xb6735ecb -0, 83, 83, 1, 126720, 0xba3059f2 -0, 84, 84, 1, 126720, 0xe7d63b8d -0, 85, 85, 1, 126720, 0x8f115906 -0, 86, 86, 1, 126720, 0xaf6a8dcb -0, 87, 87, 1, 126720, 0xb73e846e -0, 88, 88, 1, 126720, 0xedd6380f -0, 89, 89, 1, 126720, 0xd9026acf -0, 90, 90, 1, 126720, 0xa03a650b -0, 91, 91, 1, 126720, 0x262765bc -0, 92, 92, 1, 126720, 0xaaa9ded1 -0, 93, 93, 1, 126720, 0xe4f42665 -0, 94, 94, 1, 126720, 0x78daf760 -0, 95, 95, 1, 126720, 0x3b0c6ef8 -0, 96, 96, 1, 126720, 0xb745df80 -0, 97, 97, 1, 126720, 0x08e57b90 -0, 98, 98, 1, 126720, 0x6f883ab0 -0, 99, 99, 1, 126720, 0x934b4dd5 -0, 100, 100, 1, 126720, 0x762f108f -0, 101, 101, 1, 126720, 0x91ee0f2b -0, 102, 102, 1, 126720, 0x9af6e5e8 -0, 103, 103, 1, 126720, 0xdcd95e0a -0, 104, 104, 1, 126720, 0x22c33a6e -0, 105, 105, 1, 126720, 0x21c1b7f4 -0, 106, 106, 1, 126720, 0x0a66a1ed -0, 107, 107, 1, 126720, 0x53fea81b -0, 108, 108, 1, 126720, 0x597f5567 +0, 45, 45, 1, 126720, 0xc40707da +0, 46, 46, 1, 126720, 0xcd060dce +0, 47, 47, 1, 126720, 0xed4024f6 +0, 48, 48, 1, 126720, 0x7decd2b4 +0, 49, 49, 1, 126720, 0xd1d2e730 +0, 50, 50, 1, 126720, 0x77cee457 +0, 51, 51, 1, 126720, 0xe78d02c0 +0, 52, 52, 1, 126720, 0xad0beb29 +0, 53, 53, 1, 126720, 0xc414eea2 +0, 54, 54, 1, 126720, 0x6a15f17d +0, 55, 55, 1, 126720, 0x516027f6 +0, 56, 56, 1, 126720, 0x4eda9dce +0, 57, 57, 1, 126720, 0x7d9bdba3 +0, 58, 58, 1, 126720, 0x7aa3d5c0 +0, 59, 59, 1, 126720, 0x7c7a04f9 +0, 60, 60, 1, 126720, 0x3e8fb6cc +0, 61, 61, 1, 126720, 0xd5474916 +0, 62, 62, 1, 126720, 0xf3f62bab +0, 63, 63, 1, 126720, 0x2f054987 +0, 64, 64, 1, 126720, 0x974c2e81 +0, 65, 65, 1, 126720, 0xe7e28a97 +0, 66, 66, 1, 126720, 0x45e38b41 +0, 67, 67, 1, 126720, 0x169c7f19 +0, 68, 68, 1, 126720, 0x91d90ee8 +0, 69, 69, 1, 126720, 0xdd653e24 +0, 70, 70, 1, 126720, 0x0da598c4 +0, 71, 71, 1, 126720, 0x687e62cc +0, 72, 72, 1, 126720, 0x7631232d +0, 73, 73, 1, 126720, 0xbd1ea826 +0, 74, 74, 1, 126720, 0xb55f7f4b +0, 75, 75, 1, 126720, 0x923f3fc9 +0, 76, 76, 1, 126720, 0x15515301 +0, 77, 77, 1, 126720, 0x9ee066e5 +0, 78, 78, 1, 126720, 0x7c21664b +0, 79, 79, 1, 126720, 0x36849100 +0, 80, 80, 1, 126720, 0x08b1f61a +0, 81, 81, 1, 126720, 0x5bfca6e2 +0, 82, 82, 1, 126720, 0x929f60e3 +0, 83, 83, 1, 126720, 0xa2b55c29 +0, 84, 84, 1, 126720, 0x68bd3ff3 +0, 85, 85, 1, 126720, 0x30db5b29 +0, 86, 86, 1, 126720, 0x00578f9b +0, 87, 87, 1, 126720, 0x18368642 +0, 88, 88, 1, 126720, 0xbcb83a80 +0, 89, 89, 1, 126720, 0x90f36b72 +0, 90, 90, 1, 126720, 0x85e46522 +0, 91, 91, 1, 126720, 0x2429660a +0, 92, 92, 1, 126720, 0xf283dfe2 +0, 93, 93, 1, 126720, 0x896b27dc +0, 94, 94, 1, 126720, 0x5af4f961 +0, 95, 95, 1, 126720, 0x31897085 +0, 96, 96, 1, 126720, 0x441ce33e +0, 97, 97, 1, 126720, 0x903f8009 +0, 98, 98, 1, 126720, 0xbdf33dba +0, 99, 99, 1, 126720, 0x8a364f36 +0, 100, 100, 1, 126720, 0xda5513f6 +0, 101, 101, 1, 126720, 0xd60012b3 +0, 102, 102, 1, 126720, 0x67bce7be +0, 103, 103, 1, 126720, 0x697e6174 +0, 104, 104, 1, 126720, 0xbe3e3e90 +0, 105, 105, 1, 126720, 0xf3e4bba6 +0, 106, 106, 1, 126720, 0x8124a679 +0, 107, 107, 1, 126720, 0x58d1acde +0, 108, 108, 1, 126720, 0xd8a15ba3 |