mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-21 13:56:55 +00:00
2822361ed1
* qatar/master: prores: get correct size for coded V plane if alpha is present prores: do not set pixel format on codec init pthread: prevent updating AVCodecContext from itself in frame_thread_free pthread: copy coded frame dimensions in update_context_from_thread vp8: prevent read from uninitialized memory in decode_mvs vp8: force reallocation in update_thread_context after frame size change vp8: fix return value if update_dimensions fails matroskadec: fix out of bounds write adpcmdec: calculate actual number of output samples for each decoder. adpcmdec: check remaining buffer size before decoding next block in the ADPCM IMA WAV decoder. adpcmdec: do not terminate early in ADPCM IMA Duck DK3 decoder. adpcmdec: remove unneeded buf_size==0 check. adpcmdec: remove unneeded zeroing of *data_size dnxhdenc: fixed signed multiplication overflow Conflicts: tests/ref/fate/prores-alpha tests/ref/fate/truemotion1-24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
45 lines
1.2 KiB
Plaintext
45 lines
1.2 KiB
Plaintext
0, 0, 69120, 0x68beb30f
|
|
1, 0, 10836, 0xedecb6a7
|
|
1, 5529, 10836, 0x8098a323
|
|
0, 6000, 69120, 0x3976f5cf
|
|
1, 11057, 10836, 0xcfa1112e
|
|
0, 12000, 69120, 0xf815bc3c
|
|
1, 16586, 10836, 0xe241ede4
|
|
0, 18000, 69120, 0xa7cc0ae6
|
|
1, 22114, 10836, 0xddf254bb
|
|
0, 24000, 69120, 0xd85ac282
|
|
1, 27643, 10836, 0xa16c8507
|
|
0, 30000, 69120, 0xf7fd7edb
|
|
1, 33171, 10836, 0xbe211f93
|
|
0, 36000, 69120, 0x433bb6f6
|
|
1, 38700, 10836, 0x26c7283d
|
|
0, 42000, 69120, 0xdbac8bee
|
|
1, 44229, 10836, 0x4d18be56
|
|
0, 48000, 69120, 0x88e2a799
|
|
1, 49757, 10836, 0x57b9af6f
|
|
0, 54000, 69120, 0x49617b26
|
|
1, 55286, 10836, 0xd5864280
|
|
0, 60000, 69120, 0xeb44ca01
|
|
1, 60814, 10836, 0xd582b451
|
|
0, 66000, 69120, 0x6fea37e8
|
|
1, 66343, 10836, 0xec13731d
|
|
1, 71871, 10836, 0xe3d4fbb8
|
|
0, 72000, 69120, 0xf55d74c7
|
|
1, 77400, 10836, 0xcbb54d18
|
|
0, 78000, 69120, 0xb5082ca7
|
|
1, 82929, 10836, 0xff7e7133
|
|
0, 84000, 69120, 0x5876d758
|
|
1, 88457, 10836, 0xcc28b1a7
|
|
0, 90000, 69120, 0x45e7dd5c
|
|
1, 93986, 10836, 0xbf9e07a5
|
|
1, 99514, 10836, 0x16408f38
|
|
1, 105043, 10836, 0x2b000c9f
|
|
1, 110571, 10836, 0x0ccd9811
|
|
1, 116100, 10836, 0xf9575d48
|
|
1, 121629, 10836, 0x1ee68190
|
|
1, 127157, 10836, 0xde435373
|
|
1, 132686, 10836, 0xd83be17a
|
|
1, 138214, 10836, 0x9a7f0bbe
|
|
1, 143743, 10836, 0x8709e4d3
|
|
1, 149271, 10836, 0xde1879cb
|