mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
479fb7b8af
* qatar/master: (35 commits) fix space type in Changelog ZeroCodec Decoder RealAudio Lossless decoder rtpenc: Use AVFormatContext.packet_size instead of a private option url: Document the expected behaviour of url_read libavformat: Use AVFormatContext.probesize in init_input docs: Fix a stray reference to tags in the generic doxy on dicts cosmetics: Align some AVInput/OutputFormat declarations zmbv: check decompress result zmbv: correct indentation adpcm: convert adpcm_thp to bytestream2. adpcm: convert adpcm_yamaha to bytestream2. adpcm: convert adpcm_swf to bytestream2. adpcm: convert adpcm_sbpro to bytestream2. adpcm: convert adpcm_ct to bytestream2. adpcm: convert adpcm_ima_amv/smjpeg to bytestream2. adpcm: convert adpcm_ea_xas to bytestream2. adpcm: convert adpcm_ea_r1/2/3 to bytestream2. adpcm: convert ea_maxis_xa to bytestream2. adpcm: convert adpcm_ea to bytestream2. ... Conflicts: Changelog libavcodec/Makefile libavcodec/adpcm.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavcodec/zerocodec.c libavcodec/zmbv.c libavformat/riff.c libavformat/url.h tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
47 lines
2.5 KiB
Plaintext
47 lines
2.5 KiB
Plaintext
#tb 0: 1/15
|
|
#tb 1: 1/44100
|
|
0, 0, 0, 1, 69120, 0x68beb30f
|
|
1, 0, 0, 2708, 10832, 0x1597b4c8
|
|
1, 2708, 2708, 2708, 10832, 0xf9479f8b
|
|
0, 1, 1, 1, 69120, 0x3976f5cf
|
|
1, 5416, 5416, 2708, 10832, 0x8db50e74
|
|
0, 2, 2, 1, 69120, 0xf815bc3c
|
|
1, 8124, 8124, 2708, 10832, 0x2b33ecbb
|
|
0, 3, 3, 1, 69120, 0xa7cc0ae6
|
|
1, 10832, 10832, 2708, 10832, 0x8d0f537b
|
|
0, 4, 4, 1, 69120, 0xd85ac282
|
|
1, 13540, 13540, 2708, 10832, 0x922081c7
|
|
0, 5, 5, 1, 69120, 0xf7fd7edb
|
|
1, 16248, 16248, 2708, 10832, 0x40291f19
|
|
0, 6, 6, 1, 69120, 0x433bb6f6
|
|
1, 18956, 18956, 2708, 10832, 0x88f5271a
|
|
0, 7, 7, 1, 69120, 0xdbac8bee
|
|
1, 21664, 21664, 2708, 10832, 0x55c6bbe5
|
|
0, 8, 8, 1, 69120, 0x88e2a799
|
|
1, 24372, 24372, 2708, 10832, 0x9b51ae82
|
|
0, 9, 9, 1, 69120, 0x49617b26
|
|
1, 27080, 27080, 2708, 10832, 0xcdf2409b
|
|
0, 10, 10, 1, 69120, 0xeb44ca01
|
|
1, 29788, 29788, 2708, 10832, 0x0933b1a4
|
|
0, 11, 11, 1, 69120, 0x6fea37e8
|
|
1, 32496, 32496, 2708, 10832, 0x24b77006
|
|
1, 35204, 35204, 2708, 10832, 0xf612fa8a
|
|
0, 12, 12, 1, 69120, 0xf55d74c7
|
|
1, 37912, 37912, 2708, 10832, 0x99884b06
|
|
0, 13, 13, 1, 69120, 0xb5082ca7
|
|
1, 40620, 40620, 2708, 10832, 0x3c746fbe
|
|
0, 14, 14, 1, 69120, 0x5876d758
|
|
1, 43328, 43328, 2708, 10832, 0x05f3b08a
|
|
0, 15, 15, 1, 69120, 0x45e7dd5c
|
|
1, 46036, 46036, 2708, 10832, 0xa6560483
|
|
1, 48744, 48744, 2708, 10832, 0xd98a8e19
|
|
1, 51452, 51452, 2708, 10832, 0xf98a0b2e
|
|
1, 54160, 54160, 2708, 10832, 0xb1039582
|
|
1, 56868, 56868, 2708, 10832, 0x85dd5c3f
|
|
1, 59576, 59576, 2708, 10832, 0x19fc801a
|
|
1, 62284, 62284, 2708, 10832, 0x95805089
|
|
1, 64992, 64992, 2708, 10832, 0x576fdec3
|
|
1, 67700, 67700, 2708, 10832, 0x704a0905
|
|
1, 70408, 70408, 2708, 10832, 0xf87ce1fa
|
|
1, 73116, 73116, 2708, 10832, 0xfc0076b9
|