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/h264-conformance-aud_mw_e | |
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/h264-conformance-aud_mw_e')
-rw-r--r-- | tests/ref/fate/h264-conformance-aud_mw_e | 201 |
1 files changed, 101 insertions, 100 deletions
diff --git a/tests/ref/fate/h264-conformance-aud_mw_e b/tests/ref/fate/h264-conformance-aud_mw_e index 202e14ecb4..83c6faeeb7 100644 --- a/tests/ref/fate/h264-conformance-aud_mw_e +++ b/tests/ref/fate/h264-conformance-aud_mw_e @@ -1,100 +1,101 @@ -0, 0, 38016, 0xa6d63b2e -0, 3600, 38016, 0x28bae101 -0, 7200, 38016, 0x139f9b29 -0, 10800, 38016, 0xa7b463e8 -0, 14400, 38016, 0xdcdc5130 -0, 18000, 38016, 0x3cf17039 -0, 21600, 38016, 0xdeeb9ae9 -0, 25200, 38016, 0xdc8da889 -0, 28800, 38016, 0x7a32a81c -0, 32400, 38016, 0xaf15908b -0, 36000, 38016, 0x4c8b5461 -0, 39600, 38016, 0x1d4826db -0, 43200, 38016, 0x5ca72731 -0, 46800, 38016, 0xb09732e6 -0, 50400, 38016, 0xa65252eb -0, 54000, 38016, 0x09fa7644 -0, 57600, 38016, 0x5262af8f -0, 61200, 38016, 0x50d6c6ac -0, 64800, 38016, 0x6895c300 -0, 68400, 38016, 0x2d58bf4f -0, 72000, 38016, 0x50dfc4c0 -0, 75600, 38016, 0x12d2cb90 -0, 79200, 38016, 0xe465c7d7 -0, 82800, 38016, 0x47c5c615 -0, 86400, 38016, 0x76fdc6e6 -0, 90000, 38016, 0xefeec7ae -0, 93600, 38016, 0x2cebcdf7 -0, 97200, 38016, 0x49abd265 -0, 100800, 38016, 0x157bdfe4 -0, 104400, 38016, 0x3635e5da -0, 108000, 38016, 0x6263aace -0, 111600, 38016, 0x7fff72f0 -0, 115200, 38016, 0x83994b85 -0, 118800, 38016, 0xa8c990a7 -0, 122400, 38016, 0xce5204c4 -0, 126000, 38016, 0xf1176131 -0, 129600, 38016, 0x4252bdca -0, 133200, 38016, 0xd8f447c3 -0, 136800, 38016, 0xc5e79075 -0, 140400, 38016, 0x5291ca60 -0, 144000, 38016, 0x5dffe889 -0, 147600, 38016, 0x6dc4fad6 -0, 151200, 38016, 0xbcc7f16a -0, 154800, 38016, 0xcd5c059a -0, 158400, 38016, 0x452314ad -0, 162000, 38016, 0x19d1fd99 -0, 165600, 38016, 0x93f4ca3c -0, 169200, 38016, 0x23dd9d81 -0, 172800, 38016, 0x4a4cabdb -0, 176400, 38016, 0x15a3d785 -0, 180000, 38016, 0xaa34e055 -0, 183600, 38016, 0x8a34b88d -0, 187200, 38016, 0x1955d649 -0, 190800, 38016, 0xf6dc0782 -0, 194400, 38016, 0x66cb360a -0, 198000, 38016, 0xf3615cfb -0, 201600, 38016, 0xca466b6d -0, 205200, 38016, 0xe0ad3523 -0, 208800, 38016, 0x8181323e -0, 212400, 38016, 0x93324bab -0, 216000, 38016, 0xce2c38b6 -0, 219600, 38016, 0xe50a20fc -0, 223200, 38016, 0x8a74ce30 -0, 226800, 38016, 0x893ca7d8 -0, 230400, 38016, 0x716fd810 -0, 234000, 38016, 0x352aeb3c -0, 237600, 38016, 0xdf14e4d1 -0, 241200, 38016, 0x7e87dd42 -0, 244800, 38016, 0xe084c706 -0, 248400, 38016, 0x4000ba1f -0, 252000, 38016, 0x10679f5a -0, 255600, 38016, 0x5cb686b2 -0, 259200, 38016, 0x5dea8ffe -0, 262800, 38016, 0x8bd27fc8 -0, 266400, 38016, 0x72912b15 -0, 270000, 38016, 0xb86be965 -0, 273600, 38016, 0x7a42da39 -0, 277200, 38016, 0x9ddacae0 -0, 280800, 38016, 0xb767ff5b -0, 284400, 38016, 0xa3c64887 -0, 288000, 38016, 0xbc6981f2 -0, 291600, 38016, 0xc2506c22 -0, 295200, 38016, 0x6e785862 -0, 298800, 38016, 0xfade2b2d -0, 302400, 38016, 0xada1d917 -0, 306000, 38016, 0x459beba1 -0, 309600, 38016, 0x8b491f3c -0, 313200, 38016, 0x917b0fab -0, 316800, 38016, 0x053fb1d2 -0, 320400, 38016, 0x96e44e17 -0, 324000, 38016, 0x4d34f7e0 -0, 327600, 38016, 0x2265c386 -0, 331200, 38016, 0xc45dd284 -0, 334800, 38016, 0x0638fca3 -0, 338400, 38016, 0xcd9c2bbc -0, 342000, 38016, 0x3220dea3 -0, 345600, 38016, 0x72dfb576 -0, 349200, 38016, 0xb804ee86 -0, 352800, 38016, 0xbd516400 -0, 356400, 38016, 0x737fa296 +#tb 0: 1/25 +0, 0, 0, 1, 38016, 0xa6d63b2e +0, 1, 1, 1, 38016, 0x28bae101 +0, 2, 2, 1, 38016, 0x139f9b29 +0, 3, 3, 1, 38016, 0xa7b463e8 +0, 4, 4, 1, 38016, 0xdcdc5130 +0, 5, 5, 1, 38016, 0x3cf17039 +0, 6, 6, 1, 38016, 0xdeeb9ae9 +0, 7, 7, 1, 38016, 0xdc8da889 +0, 8, 8, 1, 38016, 0x7a32a81c +0, 9, 9, 1, 38016, 0xaf15908b +0, 10, 10, 1, 38016, 0x4c8b5461 +0, 11, 11, 1, 38016, 0x1d4826db +0, 12, 12, 1, 38016, 0x5ca72731 +0, 13, 13, 1, 38016, 0xb09732e6 +0, 14, 14, 1, 38016, 0xa65252eb +0, 15, 15, 1, 38016, 0x09fa7644 +0, 16, 16, 1, 38016, 0x5262af8f +0, 17, 17, 1, 38016, 0x50d6c6ac +0, 18, 18, 1, 38016, 0x6895c300 +0, 19, 19, 1, 38016, 0x2d58bf4f +0, 20, 20, 1, 38016, 0x50dfc4c0 +0, 21, 21, 1, 38016, 0x12d2cb90 +0, 22, 22, 1, 38016, 0xe465c7d7 +0, 23, 23, 1, 38016, 0x47c5c615 +0, 24, 24, 1, 38016, 0x76fdc6e6 +0, 25, 25, 1, 38016, 0xefeec7ae +0, 26, 26, 1, 38016, 0x2cebcdf7 +0, 27, 27, 1, 38016, 0x49abd265 +0, 28, 28, 1, 38016, 0x157bdfe4 +0, 29, 29, 1, 38016, 0x3635e5da +0, 30, 30, 1, 38016, 0x6263aace +0, 31, 31, 1, 38016, 0x7fff72f0 +0, 32, 32, 1, 38016, 0x83994b85 +0, 33, 33, 1, 38016, 0xa8c990a7 +0, 34, 34, 1, 38016, 0xce5204c4 +0, 35, 35, 1, 38016, 0xf1176131 +0, 36, 36, 1, 38016, 0x4252bdca +0, 37, 37, 1, 38016, 0xd8f447c3 +0, 38, 38, 1, 38016, 0xc5e79075 +0, 39, 39, 1, 38016, 0x5291ca60 +0, 40, 40, 1, 38016, 0x5dffe889 +0, 41, 41, 1, 38016, 0x6dc4fad6 +0, 42, 42, 1, 38016, 0xbcc7f16a +0, 43, 43, 1, 38016, 0xcd5c059a +0, 44, 44, 1, 38016, 0x452314ad +0, 45, 45, 1, 38016, 0x19d1fd99 +0, 46, 46, 1, 38016, 0x93f4ca3c +0, 47, 47, 1, 38016, 0x23dd9d81 +0, 48, 48, 1, 38016, 0x4a4cabdb +0, 49, 49, 1, 38016, 0x15a3d785 +0, 50, 50, 1, 38016, 0xaa34e055 +0, 51, 51, 1, 38016, 0x8a34b88d +0, 52, 52, 1, 38016, 0x1955d649 +0, 53, 53, 1, 38016, 0xf6dc0782 +0, 54, 54, 1, 38016, 0x66cb360a +0, 55, 55, 1, 38016, 0xf3615cfb +0, 56, 56, 1, 38016, 0xca466b6d +0, 57, 57, 1, 38016, 0xe0ad3523 +0, 58, 58, 1, 38016, 0x8181323e +0, 59, 59, 1, 38016, 0x93324bab +0, 60, 60, 1, 38016, 0xce2c38b6 +0, 61, 61, 1, 38016, 0xe50a20fc +0, 62, 62, 1, 38016, 0x8a74ce30 +0, 63, 63, 1, 38016, 0x893ca7d8 +0, 64, 64, 1, 38016, 0x716fd810 +0, 65, 65, 1, 38016, 0x352aeb3c +0, 66, 66, 1, 38016, 0xdf14e4d1 +0, 67, 67, 1, 38016, 0x7e87dd42 +0, 68, 68, 1, 38016, 0xe084c706 +0, 69, 69, 1, 38016, 0x4000ba1f +0, 70, 70, 1, 38016, 0x10679f5a +0, 71, 71, 1, 38016, 0x5cb686b2 +0, 72, 72, 1, 38016, 0x5dea8ffe +0, 73, 73, 1, 38016, 0x8bd27fc8 +0, 74, 74, 1, 38016, 0x72912b15 +0, 75, 75, 1, 38016, 0xb86be965 +0, 76, 76, 1, 38016, 0x7a42da39 +0, 77, 77, 1, 38016, 0x9ddacae0 +0, 78, 78, 1, 38016, 0xb767ff5b +0, 79, 79, 1, 38016, 0xa3c64887 +0, 80, 80, 1, 38016, 0xbc6981f2 +0, 81, 81, 1, 38016, 0xc2506c22 +0, 82, 82, 1, 38016, 0x6e785862 +0, 83, 83, 1, 38016, 0xfade2b2d +0, 84, 84, 1, 38016, 0xada1d917 +0, 85, 85, 1, 38016, 0x459beba1 +0, 86, 86, 1, 38016, 0x8b491f3c +0, 87, 87, 1, 38016, 0x917b0fab +0, 88, 88, 1, 38016, 0x053fb1d2 +0, 89, 89, 1, 38016, 0x96e44e17 +0, 90, 90, 1, 38016, 0x4d34f7e0 +0, 91, 91, 1, 38016, 0x2265c386 +0, 92, 92, 1, 38016, 0xc45dd284 +0, 93, 93, 1, 38016, 0x0638fca3 +0, 94, 94, 1, 38016, 0xcd9c2bbc +0, 95, 95, 1, 38016, 0x3220dea3 +0, 96, 96, 1, 38016, 0x72dfb576 +0, 97, 97, 1, 38016, 0xb804ee86 +0, 98, 98, 1, 38016, 0xbd516400 +0, 99, 99, 1, 38016, 0x737fa296 |