mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +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>
18 lines
489 B
Plaintext
18 lines
489 B
Plaintext
0, 0, 921600, 0x8a5d15df
|
|
0, 6390, 921600, 0x92c01362
|
|
0, 12780, 921600, 0xe1a31643
|
|
0, 19170, 921600, 0x37a90fe2
|
|
0, 25560, 921600, 0x74410783
|
|
0, 31950, 921600, 0xecf4ef1a
|
|
0, 38340, 921600, 0x4d7ff3d4
|
|
0, 44730, 921600, 0xac820317
|
|
0, 51120, 921600, 0xbe5ff56e
|
|
0, 57510, 921600, 0x8e59c329
|
|
0, 63900, 921600, 0x73bf23f3
|
|
0, 70290, 921600, 0xb90c780f
|
|
0, 76680, 921600, 0xfbd9dc32
|
|
0, 83070, 921600, 0x30586821
|
|
0, 89460, 921600, 0x6695195b
|
|
0, 95850, 921600, 0xc449aa85
|
|
0, 102240, 921600, 0xca6a391c
|