diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-17 00:35:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-17 00:35:06 +0100 |
| commit | 8c1ebdcea2d3f84bd5c01ce3dce5e619c845bc0f (patch) | |
| tree | 977c2d42de80b6c292ff0f9ad79f14762ba792f6 /tests/ref/fate | |
| parent | 7bdefc0f1281c2c18375197985fcd5109e711829 (diff) | |
| parent | 204cb29b3c84a74cbcd059d353c70c8bdc567d98 (diff) | |
| download | ffmpeg-8c1ebdcea2d3f84bd5c01ce3dce5e619c845bc0f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
shorten: Use separate pointers for the allocated memory for decoded samples.
atrac3: Fix crash in tonal component decoding.
ws_snd1: Fix wrong samples counts.
movenc: Don't set a default sample duration when creating ismv
rtp: Factorize the check for distinguishing RTCP packets from RTP
golomb: avoid infinite loop on all-zero input (or end of buffer).
bethsoftvid: synchronize video timestamps with audio sample rate
bethsoftvid: add audio stream only after getting the first audio packet
bethsoftvid: Set video packet duration instead of accumulating pts.
bethsoftvid: set packet key frame flag for audio and I-frame video packets.
bethsoftvid: fix read_packet() return codes.
bethsoftvid: pass palette in side data instead of in a separate packet.
sdp: Ignore RTCP packets when autodetecting RTP streams
proresenc: initialise 'sign' variable
mpegaudio: replace memcpy by SIMD code
vc1: prevent using last_frame as a reference for I/P first frame.
Conflicts:
libavcodec/atrac3.c
libavcodec/golomb.h
libavcodec/shorten.c
libavcodec/ws-snd1.c
tests/ref/fate/bethsoft-vid
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate')
| -rw-r--r-- | tests/ref/fate/bethsoft-vid | 143 |
1 files changed, 72 insertions, 71 deletions
diff --git a/tests/ref/fate/bethsoft-vid b/tests/ref/fate/bethsoft-vid index 7599bf018c..19674270a4 100644 --- a/tests/ref/fate/bethsoft-vid +++ b/tests/ref/fate/bethsoft-vid @@ -1,143 +1,144 @@ -#tb 0: 1/60 +#tb 0: 1/14 #tb 1: 1/11111 +0, 0, 0, 1, 192000, 0x00000000 1, 0, 0, 740, 1480, 0x00000000 -0, 1, 1, 1, 192000, 0x00000000 1, 740, 740, 740, 1480, 0x20a92bd4 -0, 5, 5, 1, 192000, 0x5a5acf57 +0, 1, 1, 1, 192000, 0x5a5acf57 1, 1480, 1480, 925, 1850, 0xa9e48a74 -0, 10, 10, 1, 192000, 0xbd055cf1 +0, 2, 2, 1, 192000, 0xbd055cf1 +0, 3, 3, 1, 192000, 0x28b1eefc 1, 2405, 2405, 740, 1480, 0x23ecd018 -0, 14, 14, 1, 192000, 0x28b1eefc 1, 3145, 3145, 740, 1480, 0x206bb915 -0, 18, 18, 1, 192000, 0x0636bacd +0, 4, 4, 1, 192000, 0x0636bacd 1, 3885, 3885, 925, 1850, 0xb0e10e75 -0, 23, 23, 1, 192000, 0xbfd33cbd +0, 5, 5, 1, 192000, 0xbfd33cbd +0, 6, 6, 1, 192000, 0x0bd150ef 1, 4810, 4810, 740, 1480, 0x8d9baedd -0, 27, 27, 1, 192000, 0x0bd150ef 1, 5550, 5550, 740, 1480, 0xb802aae1 -0, 31, 31, 1, 192000, 0x780d891e +0, 7, 7, 1, 192000, 0x780d891e 1, 6290, 6290, 740, 1480, 0xecd7b5cc -0, 35, 35, 1, 192000, 0xacf5e205 +0, 8, 8, 1, 192000, 0xacf5e205 1, 7030, 7030, 925, 1850, 0x16861355 -0, 40, 40, 1, 192000, 0x37c900dc +0, 9, 9, 1, 192000, 0x37c900dc +0, 10, 10, 1, 192000, 0x4ee6add7 1, 7955, 7955, 740, 1480, 0xa51690bd -0, 44, 44, 1, 192000, 0x4ee6add7 1, 8695, 8695, 740, 1480, 0xdd0b90d1 -0, 48, 48, 1, 192000, 0x1844783a +0, 11, 11, 1, 192000, 0x1844783a 1, 9435, 9435, 925, 1850, 0x3ce6e333 -0, 53, 53, 1, 192000, 0x7bf84848 +0, 12, 12, 1, 192000, 0x7bf84848 +0, 13, 13, 1, 192000, 0x1ec296bc 1, 10360, 10360, 740, 1480, 0xf8ce8ea3 -0, 57, 57, 1, 192000, 0x1ec296bc 1, 11100, 11100, 740, 1480, 0xda4597af -0, 61, 61, 1, 192000, 0xbaeb5292 +0, 14, 14, 1, 192000, 0xbaeb5292 1, 11840, 11840, 740, 1480, 0x918f7cb3 -0, 65, 65, 1, 192000, 0xcb18038d +0, 15, 15, 1, 192000, 0xcb18038d 1, 12580, 12580, 925, 1850, 0xca6edb15 -0, 70, 70, 1, 192000, 0xb3cc8b65 +0, 16, 16, 1, 192000, 0xb3cc8b65 +0, 17, 17, 1, 192000, 0x6f164685 1, 13505, 13505, 740, 1480, 0xba279597 -0, 74, 74, 1, 192000, 0x6f164685 1, 14245, 14245, 740, 1480, 0xc5a38a9e -0, 78, 78, 1, 192000, 0x304917c9 +0, 18, 18, 1, 192000, 0x304917c9 1, 14985, 14985, 925, 1850, 0x8147eef5 -0, 83, 83, 1, 192000, 0x8269daa1 +0, 19, 19, 1, 192000, 0x8269daa1 +0, 20, 20, 1, 192000, 0x04d3500d 1, 15910, 15910, 740, 1480, 0xce2c7cb5 -0, 87, 87, 1, 192000, 0x04d3500d 1, 16650, 16650, 740, 1480, 0x4282819f -0, 91, 91, 1, 192000, 0x9788f7a5 +0, 21, 21, 1, 192000, 0x9788f7a5 1, 17390, 17390, 740, 1480, 0xbdbb8da6 -0, 95, 95, 1, 192000, 0x05351c98 +0, 22, 22, 1, 192000, 0x05351c98 1, 18130, 18130, 925, 1850, 0xdbbeea10 -0, 100, 100, 1, 192000, 0xcc8bba97 +0, 23, 23, 1, 192000, 0xcc8bba97 +0, 24, 24, 1, 192000, 0x76caf27b 1, 19055, 19055, 740, 1480, 0xbe6a77c2 -0, 104, 104, 1, 192000, 0x76caf27b 1, 19795, 19795, 740, 1480, 0xa85c75b2 -0, 108, 108, 1, 192000, 0x28648040 +0, 25, 25, 1, 192000, 0x28648040 1, 20535, 20535, 925, 1850, 0xa45bde21 -0, 113, 113, 1, 192000, 0x99ea251f +0, 26, 26, 1, 192000, 0x99ea251f +0, 27, 27, 1, 192000, 0x20e7bf4d 1, 21460, 21460, 740, 1480, 0x84aa7895 -0, 117, 117, 1, 192000, 0x20e7bf4d 1, 22200, 22200, 740, 1480, 0x147f7d9f -0, 121, 121, 1, 192000, 0x046ed625 +0, 28, 28, 1, 192000, 0x046ed625 1, 22940, 22940, 740, 1480, 0xc8e77b85 -0, 125, 125, 1, 192000, 0x1613fb12 +0, 29, 29, 1, 192000, 0x1613fb12 1, 23680, 23680, 925, 1850, 0x10d4d81b -0, 130, 130, 1, 192000, 0xd8b52d16 +0, 30, 30, 1, 192000, 0xd8b52d16 +0, 31, 31, 1, 192000, 0x31443aa9 1, 24605, 24605, 740, 1480, 0xb4ae8bb1 -0, 134, 134, 1, 192000, 0x31443aa9 1, 25345, 25345, 740, 1480, 0x3ef782a5 -0, 138, 138, 1, 192000, 0xd426de3d +0, 32, 32, 1, 192000, 0xd426de3d 1, 26085, 26085, 925, 1850, 0xdeebda14 -0, 143, 143, 1, 192000, 0xb2bce77b +0, 33, 33, 1, 192000, 0xb2bce77b +0, 34, 34, 1, 192000, 0x25a52805 1, 27010, 27010, 740, 1480, 0x4c7e7bbb -0, 147, 147, 1, 192000, 0x25a52805 1, 27750, 27750, 740, 1480, 0x0e0e9198 -0, 151, 151, 1, 192000, 0x04f03a87 +0, 35, 35, 1, 192000, 0x04f03a87 1, 28490, 28490, 740, 1480, 0x5c1f819f -0, 155, 155, 1, 192000, 0x41d56889 +0, 36, 36, 1, 192000, 0x41d56889 1, 29230, 29230, 925, 1850, 0x0e4cf6ff -0, 160, 160, 1, 192000, 0x3d4d6de9 +0, 37, 37, 1, 192000, 0x3d4d6de9 1, 30155, 30155, 740, 1480, 0x374388a7 -0, 164, 164, 1, 192000, 0xa7a2abfe +0, 38, 38, 1, 192000, 0xa7a2abfe 1, 30895, 30895, 740, 1480, 0xed729389 -0, 168, 168, 1, 192000, 0x663e9fca +0, 39, 39, 1, 192000, 0x663e9fca 1, 31635, 31635, 925, 1850, 0xe0f1e43f -0, 173, 173, 1, 192000, 0x29a67f86 +0, 40, 40, 1, 192000, 0x29a67f86 +0, 41, 41, 1, 192000, 0x51531bb0 1, 32560, 32560, 740, 1480, 0x3b27839a -0, 177, 177, 1, 192000, 0x51531bb0 1, 33300, 33300, 740, 1480, 0xe6287e94 -0, 181, 181, 1, 192000, 0xd993277e +0, 42, 42, 1, 192000, 0xd993277e 1, 34040, 34040, 740, 1480, 0x7e0d84b5 -0, 185, 185, 1, 192000, 0x4873e583 +0, 43, 43, 1, 192000, 0x4873e583 1, 34780, 34780, 925, 1850, 0xf08bebf7 -0, 190, 190, 1, 192000, 0x06df053b +0, 44, 44, 1, 192000, 0x06df053b 1, 35705, 35705, 740, 1480, 0x94cf73a0 -0, 194, 194, 1, 192000, 0x044f7698 +0, 45, 45, 1, 192000, 0x044f7698 1, 36445, 36445, 740, 1480, 0xfef384ae -0, 198, 198, 1, 192000, 0xc2302a45 +0, 46, 46, 1, 192000, 0xc2302a45 1, 37185, 37185, 925, 1850, 0x3b93e0f7 -0, 203, 203, 1, 192000, 0xbdfec8ee +0, 47, 47, 1, 192000, 0xbdfec8ee +0, 48, 48, 1, 192000, 0x3b739286 1, 38110, 38110, 740, 1480, 0x28d27bae -0, 207, 207, 1, 192000, 0x3b739286 1, 38850, 38850, 740, 1480, 0x94d57da5 -0, 211, 211, 1, 192000, 0x3ca82cd6 +0, 49, 49, 1, 192000, 0x3ca82cd6 1, 39590, 39590, 740, 1480, 0xc9327db5 -0, 215, 215, 1, 192000, 0x25af10f2 +0, 50, 50, 1, 192000, 0x25af10f2 1, 40330, 40330, 925, 1850, 0xe781f604 -0, 220, 220, 1, 192000, 0x09ce32bf +0, 51, 51, 1, 192000, 0x09ce32bf 1, 41255, 41255, 740, 1480, 0x752f8c5b -0, 224, 224, 1, 192000, 0xdab399c2 +0, 52, 52, 1, 192000, 0xdab399c2 1, 41995, 41995, 740, 1480, 0x30068032 -0, 228, 228, 1, 192000, 0x77400d93 +0, 53, 53, 1, 192000, 0x77400d93 1, 42735, 42735, 925, 1850, 0x7895023e -0, 233, 233, 1, 192000, 0x5e8e6fe7 +0, 54, 54, 1, 192000, 0x5e8e6fe7 +0, 55, 55, 1, 192000, 0x277506c9 1, 43660, 43660, 740, 1480, 0xa1e0a6e1 -0, 237, 237, 1, 192000, 0x277506c9 1, 44400, 44400, 740, 1480, 0x6af4b500 -0, 241, 241, 1, 192000, 0xe91b59ac +0, 56, 56, 1, 192000, 0xe91b59ac 1, 45140, 45140, 740, 1480, 0xc26ea4c7 -0, 245, 245, 1, 192000, 0xc2aa6e19 +0, 57, 57, 1, 192000, 0xc2aa6e19 1, 45880, 45880, 925, 1850, 0x16a72419 -0, 250, 250, 1, 192000, 0x12c63645 +0, 58, 58, 1, 192000, 0x12c63645 1, 46805, 46805, 740, 1480, 0x1794aacc -0, 254, 254, 1, 192000, 0xa39f27d6 +0, 59, 59, 1, 192000, 0xa39f27d6 1, 47545, 47545, 740, 1480, 0x2ecad8d0 -0, 258, 258, 1, 192000, 0x20c32512 +0, 60, 60, 1, 192000, 0x20c32512 1, 48285, 48285, 925, 1850, 0x2e645e07 -0, 263, 263, 1, 192000, 0x385a26a0 +0, 61, 61, 1, 192000, 0x385a26a0 +0, 62, 62, 1, 192000, 0x2566a70c 1, 49210, 49210, 740, 1480, 0x1c54dfe7 -0, 267, 267, 1, 192000, 0x2566a70c 1, 49950, 49950, 740, 1480, 0xbd35feec -0, 271, 271, 1, 192000, 0x7105cfb9 +0, 63, 63, 1, 192000, 0x7105cfb9 1, 50690, 50690, 740, 1480, 0x419403d6 -0, 275, 275, 1, 192000, 0x725671a2 +0, 64, 64, 1, 192000, 0x725671a2 1, 51430, 51430, 925, 1850, 0x78699d2a -0, 280, 280, 1, 192000, 0x3ff2782a +0, 65, 65, 1, 192000, 0x3ff2782a 1, 52355, 52355, 740, 1480, 0x74ec68e0 -0, 284, 284, 1, 192000, 0xdc0571c3 +0, 66, 66, 1, 192000, 0xdc0571c3 1, 53095, 53095, 740, 1480, 0x76af64d9 -0, 288, 288, 1, 192000, 0x4a6a5405 +0, 67, 67, 1, 192000, 0x4a6a5405 1, 53835, 53835, 925, 1850, 0x5a303d1a -0, 293, 293, 1, 192000, 0x3ec3cce1 +0, 68, 68, 1, 192000, 0x3ec3cce1 1, 54760, 54760, 537, 1074, 0x142ce7ba -0, 297, 297, 1, 192000, 0x159313a8 +0, 69, 69, 1, 192000, 0x159313a8 1, 55297, 55297, 925, 1850, 0x7ff682f7 +0, 70, 70, 1, 192000, 0x8e685d68 |