mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-30 03:12:08 +00: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>
32 lines
1.7 KiB
Plaintext
32 lines
1.7 KiB
Plaintext
#tb 0: 1/15
|
|
0, 0, 0, 1, 230400, 0x26a4728c
|
|
0, 1, 1, 1, 230400, 0xa5ff0a21
|
|
0, 2, 2, 1, 230400, 0x479d767d
|
|
0, 3, 3, 1, 230400, 0xc619cd01
|
|
0, 4, 4, 1, 230400, 0x1d377157
|
|
0, 5, 5, 1, 230400, 0x1d377157
|
|
0, 6, 6, 1, 230400, 0x0941c629
|
|
0, 7, 7, 1, 230400, 0xe64b3a93
|
|
0, 8, 8, 1, 230400, 0x28493fd7
|
|
0, 9, 9, 1, 230400, 0x18c77af2
|
|
0, 10, 10, 1, 230400, 0x18c77af2
|
|
0, 11, 11, 1, 230400, 0x5a542008
|
|
0, 12, 12, 1, 230400, 0x5a542008
|
|
0, 13, 13, 1, 230400, 0x3b1a34fd
|
|
0, 14, 14, 1, 230400, 0x77d34944
|
|
0, 15, 15, 1, 230400, 0x50ac218c
|
|
0, 16, 16, 1, 230400, 0xcb999f16
|
|
0, 17, 17, 1, 230400, 0xe1ce9f19
|
|
0, 18, 18, 1, 230400, 0xb10b4264
|
|
0, 19, 19, 1, 230400, 0x61207031
|
|
0, 20, 20, 1, 230400, 0x81626d5b
|
|
0, 21, 21, 1, 230400, 0x81626d5b
|
|
0, 22, 22, 1, 230400, 0x1cb59751
|
|
0, 23, 23, 1, 230400, 0x316e6962
|
|
0, 24, 24, 1, 230400, 0x4c01b829
|
|
0, 25, 25, 1, 230400, 0x276e32bc
|
|
0, 26, 26, 1, 230400, 0x276e32bc
|
|
0, 27, 27, 1, 230400, 0xe251117a
|
|
0, 28, 28, 1, 230400, 0xe251117a
|
|
0, 29, 29, 1, 230400, 0x41b7f098
|