mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
3b46daa31f
* 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>
27 lines
1.4 KiB
Plaintext
27 lines
1.4 KiB
Plaintext
#tb 0: 1/90000
|
|
0, 0, 0, 0, 20883, 0x347191e2
|
|
0, 0, 3600, 0, 20882, 0xe1573905
|
|
0, 3600, 7200, 0, 20894, 0xd54f516a
|
|
0, 7200, 10800, 0, 20891, 0x1b5c5039
|
|
0, 10800, 14400, 0, 20883, 0x8e785b4d
|
|
0, 14400, 18000, 0, 20870, 0xd26ca1f6
|
|
0, 18000, 21600, 0, 21448, 0x946f5b2b
|
|
0, 21600, 25200, 0, 21433, 0xb18687c5
|
|
0, 25200, 28800, 0, 20865, 0xc0eb3fce
|
|
0, 28800, 32399, 0, 20842, 0x9d0728ba
|
|
0, 32399, 35999, 0, 20878, 0xf60f5dee
|
|
0, 35999, 39600, 0, 20866, 0x3bde568f
|
|
0, 39600, 43200, 0, 20884, 0x22736993
|
|
0, 43200, 46800, 0, 20860, 0xf56f2fca
|
|
0, 46800, 50400, 0, 20872, 0xf39e3cb3
|
|
0, 50400, 53999, 0, 20835, 0xa3c4363b
|
|
0, 53999, 57600, 0, 20905, 0x552853d1
|
|
0, 57600, 61200, 0, 20874, 0xed0b91ec
|
|
0, 61200, 64799, 0, 20877, 0xe1623e01
|
|
0, 64799, 68399, 0, 20933, 0x19906564
|
|
0, 68399, 72000, 0, 20891, 0x3d064fd3
|
|
0, 72000, 75600, 0, 20834, 0xcb774dbc
|
|
0, 75600, 79200, 0, 20870, 0xbc536589
|
|
0, 79200, 82800, 0, 21421, 0xc99a68e4
|
|
0, 82800, 86400, 0, 12869, 0x5684e304
|