mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
4121148388
* qatar/master: avconv: make -frames work for all types of streams, not just video. bfi: K&R cosmetics bgmc: K&R cleanup rawdec: Set start_time to 0 for raw audio files. Detect 'yuv2' as rawvideo also in avi. rawdec: propagate pict_type information to the output frame rawdec: Support more QT 1bpp rawvideo files. avconv: free bitstream filters threads: limit the number of automatic threads to MAX_AUTO_THREADS avplay: K&R cleanup fate: use rgb24 as output format for dfa tests threads: set thread_count to 1 when thread support is disabled threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264 Conflicts: ffplay.c libavcodec/avcodec.h libavcodec/pthread.c libavcodec/version.h 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 Merged-by: Michael Niedermayer <michaelni@gmx.at>
37 lines
1.0 KiB
Plaintext
37 lines
1.0 KiB
Plaintext
0, 0, 134724, 0x53784ca9
|
|
0, 6390, 134724, 0x14c345b7
|
|
0, 12780, 134724, 0xe0d0dd51
|
|
0, 19170, 134724, 0xd53b5610
|
|
0, 25560, 134724, 0x7cbb8d47
|
|
0, 31950, 134724, 0x875d67c4
|
|
0, 38340, 134724, 0x9811c085
|
|
0, 44730, 134724, 0x25f6d228
|
|
0, 51120, 134724, 0x349495a0
|
|
0, 57510, 134724, 0xd0d75311
|
|
0, 63900, 134724, 0xb49cdfbb
|
|
0, 70290, 134724, 0x9fa69518
|
|
0, 76680, 134724, 0x28a1f58c
|
|
0, 83070, 134724, 0xb8dab657
|
|
0, 89460, 134724, 0x8c7e3b3b
|
|
0, 95850, 134724, 0x37268acf
|
|
0, 102240, 134724, 0xcce8ca02
|
|
0, 108630, 134724, 0xe0fd0c28
|
|
0, 115020, 134724, 0x5bdac906
|
|
0, 121410, 134724, 0xdd850bf0
|
|
0, 127800, 134724, 0x2002a228
|
|
0, 134190, 134724, 0x633617ea
|
|
0, 140580, 134724, 0x2a3ef337
|
|
0, 146970, 134724, 0x507886c3
|
|
0, 153360, 134724, 0x51c0f07b
|
|
0, 159750, 134724, 0x5e73dce1
|
|
0, 166140, 134724, 0x26acc6f0
|
|
0, 172530, 134724, 0x360c4349
|
|
0, 178920, 134724, 0xc7dbabd4
|
|
0, 185310, 134724, 0x671bbf66
|
|
0, 191700, 134724, 0x4d44df79
|
|
0, 198090, 134724, 0x69eade5b
|
|
0, 204480, 134724, 0x2b1bca82
|
|
0, 210870, 134724, 0x8b16af47
|
|
0, 217260, 134724, 0xb59fa1bd
|
|
0, 223650, 134724, 0x2ec17c24
|