diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-04 02:14:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-04 02:34:14 +0100 |
| commit | 3b46daa31f566f9c6ef1518c1767b12e0ab2f62a (patch) | |
| tree | e0baf74dc919859429488d4ea73cfc92e96db414 /tests/ref/fate/kmvc | |
| parent | 670229ef4392fa88d6add97c0eef412a5d6083c0 (diff) | |
| parent | 6f1a5e8d6b7e085171a49b8ce6a371a7c9643764 (diff) | |
| download | ffmpeg-3b46daa31f566f9c6ef1518c1767b12e0ab2f62a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: remove debug message in dsputil_init().
movdec: Avoid av_malloc(0) in stss
build: Drop YASM-OBJS-FFT from SUBDIR_VARS.
build: Drop unused X86-OBJS variable.
avconv: remove debugging cruft from do_video_out().
avconv: factorize setting stream_index for the output packet.
frame{crc/md5}: set the stream timebase from codec timebase.
apedec: remove unneeded #include of get_bits.h and associated macro
apedec: av_fast_malloc() instead of av_realloc()
apedec: fix handling of packet sizes that are not a multiple of 4 bytes
Conflicts:
libavcodec/apedec.c
tests/ref/fate/4xm-1
tests/ref/fate/4xm-2
tests/ref/fate/aasc
tests/ref/fate/armovie-escape124
tests/ref/fate/bethsoft-vid
tests/ref/fate/cljr
tests/ref/fate/creatureshock-avs
tests/ref/fate/cscd
tests/ref/fate/cvid-partial
tests/ref/fate/deluxepaint-anm
tests/ref/fate/dfa1
tests/ref/fate/dfa10
tests/ref/fate/dfa11
tests/ref/fate/dfa2
tests/ref/fate/dfa3
tests/ref/fate/dfa4
tests/ref/fate/dfa5
tests/ref/fate/dfa6
tests/ref/fate/dfa7
tests/ref/fate/dfa8
tests/ref/fate/dfa9
tests/ref/fate/film-cvid-pcm-stereo-8bit
tests/ref/fate/flic-af11-palette-change
tests/ref/fate/flic-magiccarpet
tests/ref/fate/fraps-v2
tests/ref/fate/fraps-v3
tests/ref/fate/h264-lossless
tests/ref/fate/interplay-mve-16bit
tests/ref/fate/interplay-mve-8bit
tests/ref/fate/mimic
tests/ref/fate/motionpixels
tests/ref/fate/mpeg2-field-enc
tests/ref/fate/msvideo1-16bit
tests/ref/fate/mtv
tests/ref/fate/nuv
tests/ref/fate/pictor
tests/ref/fate/prores-alpha
tests/ref/fate/ptx
tests/ref/fate/qtrle-16bit
tests/ref/fate/qtrle-1bit
tests/ref/fate/quickdraw
tests/ref/fate/rpza
tests/ref/fate/sierra-vmd
tests/ref/fate/targa-conformance-CCM8
tests/ref/fate/targa-conformance-UCM8
tests/ref/fate/tiertex-seq
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24
tests/ref/fate/tscc-15bit
tests/ref/fate/tscc-32bit
tests/ref/fate/v210
tests/ref/fate/vc1-ism
tests/ref/fate/vc1_sa00040
tests/ref/fate/vc1_sa00050
tests/ref/fate/vc1_sa10091
tests/ref/fate/vc1_sa20021
tests/ref/fate/vmnc-16bit
tests/ref/fate/vmnc-32bit
tests/ref/fate/vp5
tests/ref/fate/vp8-sign-bias
tests/ref/fate/vqa-cc
tests/ref/fate/wmv8-drm
tests/ref/fate/yop
tests/ref/fate/zmbv-8bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/kmvc')
| -rw-r--r-- | tests/ref/fate/kmvc | 151 |
1 files changed, 76 insertions, 75 deletions
diff --git a/tests/ref/fate/kmvc b/tests/ref/fate/kmvc index eb7bcdac06..8a733bbb4e 100644 --- a/tests/ref/fate/kmvc +++ b/tests/ref/fate/kmvc @@ -1,75 +1,76 @@ -0, 0, 153600, 0x00000000 -0, 3600, 153600, 0x00000000 -0, 7200, 153600, 0x00000000 -0, 10800, 153600, 0x3ad906f0 -0, 14400, 153600, 0x9f7c2e80 -0, 18000, 153600, 0x548c9e10 -0, 21600, 153600, 0xab4154e7 -0, 25200, 153600, 0x762964be -0, 28800, 153600, 0xea6beab1 -0, 32400, 153600, 0x00805c23 -0, 36000, 153600, 0x932eebd2 -0, 39600, 153600, 0x73a9a1c4 -0, 43200, 153600, 0x3ecf80a2 -0, 46800, 153600, 0xb7266fcc -0, 50400, 153600, 0xf9a75e02 -0, 54000, 153600, 0xa4cb4c00 -0, 57600, 153600, 0x8cc653fa -0, 61200, 153600, 0xf0735df0 -0, 64800, 153600, 0x46945766 -0, 68400, 153600, 0x1cf75120 -0, 72000, 153600, 0x015d4476 -0, 75600, 153600, 0x4ad6419c -0, 79200, 153600, 0xf97a1292 -0, 82800, 153600, 0x8048c6bd -0, 86400, 153600, 0x0aa97f7f -0, 90000, 153600, 0xcd1a0531 -0, 93600, 153600, 0xeb9e72b4 -0, 97200, 153600, 0x5a61d657 -0, 100800, 153600, 0xc4eb1759 -0, 104400, 153600, 0x07b05b0c -0, 108000, 153600, 0x9c417927 -0, 111600, 153600, 0xa3a28516 -0, 115200, 153600, 0x78e97511 -0, 118800, 153600, 0x05c94e38 -0, 122400, 153600, 0x0003ffa4 -0, 126000, 153600, 0x46489827 -0, 129600, 153600, 0xa6ac0ea6 -0, 133200, 153600, 0xf4ae7e9a -0, 136800, 153600, 0xe07dd526 -0, 140400, 153600, 0x5c0d0ab9 -0, 144000, 153600, 0xad542525 -0, 147600, 153600, 0xa72a35b1 -0, 151200, 153600, 0x373d3cbd -0, 154800, 153600, 0x242c3cad -0, 158400, 153600, 0xbe4f44e5 -0, 162000, 153600, 0x3b883575 -0, 165600, 153600, 0xcd7d2995 -0, 169200, 153600, 0x89a01f99 -0, 172800, 153600, 0x79ac0861 -0, 176400, 153600, 0xefb6ee22 -0, 180000, 153600, 0x4498d6b2 -0, 183600, 153600, 0x99efd0a6 -0, 187200, 153600, 0xd937c282 -0, 190800, 153600, 0xa6c6bbb2 -0, 194400, 153600, 0xf667bf0e -0, 198000, 153600, 0x83b2c12e -0, 201600, 153600, 0xcbd6c766 -0, 205200, 153600, 0xc5b3c762 -0, 208800, 153600, 0xe51fc5fa -0, 212400, 153600, 0x6542c5ee -0, 216000, 153600, 0x59d2c946 -0, 219600, 153600, 0xccaacdde -0, 223200, 153600, 0x884ec6aa -0, 226800, 153600, 0xb3d7c2de -0, 230400, 153600, 0xd4e8c1a2 -0, 234000, 153600, 0xa416c3ba -0, 237600, 153600, 0x6905b62e -0, 241200, 153600, 0xce16b456 -0, 244800, 153600, 0xcbd9a67e -0, 248400, 153600, 0x6785afd6 -0, 252000, 153600, 0x6fd7b1fa -0, 255600, 153600, 0x2a65b77e -0, 259200, 153600, 0xa162aff6 -0, 262800, 153600, 0x227ea802 -0, 266400, 153600, 0x98de79fa +#tb 0: 1/25 +0, 0, 0, 1, 153600, 0x00000000 +0, 1, 1, 1, 153600, 0x00000000 +0, 2, 2, 1, 153600, 0x00000000 +0, 3, 3, 1, 153600, 0x3ad906f0 +0, 4, 4, 1, 153600, 0x9f7c2e80 +0, 5, 5, 1, 153600, 0x548c9e10 +0, 6, 6, 1, 153600, 0xab4154e7 +0, 7, 7, 1, 153600, 0x762964be +0, 8, 8, 1, 153600, 0xea6beab1 +0, 9, 9, 1, 153600, 0x00805c23 +0, 10, 10, 1, 153600, 0x932eebd2 +0, 11, 11, 1, 153600, 0x73a9a1c4 +0, 12, 12, 1, 153600, 0x3ecf80a2 +0, 13, 13, 1, 153600, 0xb7266fcc +0, 14, 14, 1, 153600, 0xf9a75e02 +0, 15, 15, 1, 153600, 0xa4cb4c00 +0, 16, 16, 1, 153600, 0x8cc653fa +0, 17, 17, 1, 153600, 0xf0735df0 +0, 18, 18, 1, 153600, 0x46945766 +0, 19, 19, 1, 153600, 0x1cf75120 +0, 20, 20, 1, 153600, 0x015d4476 +0, 21, 21, 1, 153600, 0x4ad6419c +0, 22, 22, 1, 153600, 0xf97a1292 +0, 23, 23, 1, 153600, 0x8048c6bd +0, 24, 24, 1, 153600, 0x0aa97f7f +0, 25, 25, 1, 153600, 0xcd1a0531 +0, 26, 26, 1, 153600, 0xeb9e72b4 +0, 27, 27, 1, 153600, 0x5a61d657 +0, 28, 28, 1, 153600, 0xc4eb1759 +0, 29, 29, 1, 153600, 0x07b05b0c +0, 30, 30, 1, 153600, 0x9c417927 +0, 31, 31, 1, 153600, 0xa3a28516 +0, 32, 32, 1, 153600, 0x78e97511 +0, 33, 33, 1, 153600, 0x05c94e38 +0, 34, 34, 1, 153600, 0x0003ffa4 +0, 35, 35, 1, 153600, 0x46489827 +0, 36, 36, 1, 153600, 0xa6ac0ea6 +0, 37, 37, 1, 153600, 0xf4ae7e9a +0, 38, 38, 1, 153600, 0xe07dd526 +0, 39, 39, 1, 153600, 0x5c0d0ab9 +0, 40, 40, 1, 153600, 0xad542525 +0, 41, 41, 1, 153600, 0xa72a35b1 +0, 42, 42, 1, 153600, 0x373d3cbd +0, 43, 43, 1, 153600, 0x242c3cad +0, 44, 44, 1, 153600, 0xbe4f44e5 +0, 45, 45, 1, 153600, 0x3b883575 +0, 46, 46, 1, 153600, 0xcd7d2995 +0, 47, 47, 1, 153600, 0x89a01f99 +0, 48, 48, 1, 153600, 0x79ac0861 +0, 49, 49, 1, 153600, 0xefb6ee22 +0, 50, 50, 1, 153600, 0x4498d6b2 +0, 51, 51, 1, 153600, 0x99efd0a6 +0, 52, 52, 1, 153600, 0xd937c282 +0, 53, 53, 1, 153600, 0xa6c6bbb2 +0, 54, 54, 1, 153600, 0xf667bf0e +0, 55, 55, 1, 153600, 0x83b2c12e +0, 56, 56, 1, 153600, 0xcbd6c766 +0, 57, 57, 1, 153600, 0xc5b3c762 +0, 58, 58, 1, 153600, 0xe51fc5fa +0, 59, 59, 1, 153600, 0x6542c5ee +0, 60, 60, 1, 153600, 0x59d2c946 +0, 61, 61, 1, 153600, 0xccaacdde +0, 62, 62, 1, 153600, 0x884ec6aa +0, 63, 63, 1, 153600, 0xb3d7c2de +0, 64, 64, 1, 153600, 0xd4e8c1a2 +0, 65, 65, 1, 153600, 0xa416c3ba +0, 66, 66, 1, 153600, 0x6905b62e +0, 67, 67, 1, 153600, 0xce16b456 +0, 68, 68, 1, 153600, 0xcbd9a67e +0, 69, 69, 1, 153600, 0x6785afd6 +0, 70, 70, 1, 153600, 0x6fd7b1fa +0, 71, 71, 1, 153600, 0x2a65b77e +0, 72, 72, 1, 153600, 0xa162aff6 +0, 73, 73, 1, 153600, 0x227ea802 +0, 74, 74, 1, 153600, 0x98de79fa |