diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-16 03:44:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-16 04:02:09 +0200 |
| commit | 2822361ed1fe18b03a35dfdbda811de6bd919e0a (patch) | |
| tree | 353c0ad65fd1a4c151e2c7cb02c415f56b8e75eb /tests/ref/fate/truemotion1-24 | |
| parent | 647ec6fc0308ccfc86ad48b1d7d20d85ddf6825c (diff) | |
| parent | 91038cdbd160310174aad6833d1d08c65d850e78 (diff) | |
| download | ffmpeg-streaming-2822361ed1fe18b03a35dfdbda811de6bd919e0a.zip ffmpeg-streaming-2822361ed1fe18b03a35dfdbda811de6bd919e0a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'tests/ref/fate/truemotion1-24')
| -rw-r--r-- | tests/ref/fate/truemotion1-24 | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/tests/ref/fate/truemotion1-24 b/tests/ref/fate/truemotion1-24 index edca66f..55576ee 100644 --- a/tests/ref/fate/truemotion1-24 +++ b/tests/ref/fate/truemotion1-24 @@ -1,44 +1,44 @@ 0, 0, 69120, 0x68beb30f -1, 0, 10832, 0x1597b4c8 -1, 5527, 10832, 0xf9479f8b +1, 0, 10836, 0xedecb6a7 +1, 5529, 10836, 0x8098a323 0, 6000, 69120, 0x3976f5cf -1, 11053, 10832, 0x8db50e74 +1, 11057, 10836, 0xcfa1112e 0, 12000, 69120, 0xf815bc3c -1, 16580, 10832, 0x2b33ecbb +1, 16586, 10836, 0xe241ede4 0, 18000, 69120, 0xa7cc0ae6 -1, 22106, 10832, 0x8d0f537b +1, 22114, 10836, 0xddf254bb 0, 24000, 69120, 0xd85ac282 -1, 27633, 10832, 0x922081c7 +1, 27643, 10836, 0xa16c8507 0, 30000, 69120, 0xf7fd7edb -1, 33159, 10832, 0x40291f19 +1, 33171, 10836, 0xbe211f93 0, 36000, 69120, 0x433bb6f6 -1, 38686, 10832, 0x88f5271a +1, 38700, 10836, 0x26c7283d 0, 42000, 69120, 0xdbac8bee -1, 44212, 10832, 0x55c6bbe5 +1, 44229, 10836, 0x4d18be56 0, 48000, 69120, 0x88e2a799 -1, 49739, 10832, 0x9b51ae82 +1, 49757, 10836, 0x57b9af6f 0, 54000, 69120, 0x49617b26 -1, 55265, 10832, 0xcdf2409b +1, 55286, 10836, 0xd5864280 0, 60000, 69120, 0xeb44ca01 -1, 60792, 10832, 0x0933b1a4 +1, 60814, 10836, 0xd582b451 0, 66000, 69120, 0x6fea37e8 -1, 66318, 10832, 0x24b77006 -1, 71845, 10832, 0xf612fa8a +1, 66343, 10836, 0xec13731d +1, 71871, 10836, 0xe3d4fbb8 0, 72000, 69120, 0xf55d74c7 -1, 77371, 10832, 0x99884b06 +1, 77400, 10836, 0xcbb54d18 0, 78000, 69120, 0xb5082ca7 -1, 82898, 10832, 0x3c746fbe +1, 82929, 10836, 0xff7e7133 0, 84000, 69120, 0x5876d758 -1, 88424, 10832, 0x05f3b08a +1, 88457, 10836, 0xcc28b1a7 0, 90000, 69120, 0x45e7dd5c -1, 93951, 10832, 0xa6560483 -1, 99478, 10832, 0xd98a8e19 -1, 105004, 10832, 0xf98a0b2e -1, 110531, 10832, 0xb1039582 -1, 116057, 10832, 0x85dd5c3f -1, 121584, 10832, 0x19fc801a -1, 127110, 10832, 0x95805089 -1, 132637, 10832, 0x576fdec3 -1, 138163, 10832, 0x704a0905 -1, 143690, 10832, 0xf87ce1fa -1, 149216, 10832, 0xfc0076b9 +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 |
