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>
16 lines
433 B
Plaintext
16 lines
433 B
Plaintext
0, 0, 192000, 0x9754890f
|
|
0, 9000, 192000, 0x01668965
|
|
0, 18000, 192000, 0xbd1b5e12
|
|
0, 27000, 192000, 0x2e97fb9f
|
|
0, 36000, 192000, 0xf8b452e2
|
|
0, 45000, 192000, 0xc6859449
|
|
0, 54000, 192000, 0x910844f7
|
|
0, 63000, 192000, 0x99443581
|
|
0, 72000, 192000, 0xec52d1e5
|
|
0, 81000, 192000, 0x2fc66c35
|
|
0, 90000, 192000, 0xd9af7379
|
|
0, 99000, 192000, 0x947a26ef
|
|
0, 108000, 192000, 0x7b77ab28
|
|
0, 117000, 192000, 0x2507637e
|
|
0, 126000, 192000, 0x6ce8c0ea
|