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>
13 lines
343 B
Plaintext
13 lines
343 B
Plaintext
0, 0, 192000, 0xb718dc63
|
|
0, 6390, 192000, 0x2efb7b89
|
|
0, 12780, 192000, 0x70827047
|
|
0, 19170, 192000, 0x61e1fd2f
|
|
0, 25560, 192000, 0x06f8bccd
|
|
0, 31950, 192000, 0xf0362404
|
|
0, 38340, 192000, 0xc00fc1b8
|
|
0, 44730, 192000, 0x94265476
|
|
0, 51120, 192000, 0x4b50ad23
|
|
0, 57510, 192000, 0x4d578b60
|
|
0, 63900, 192000, 0xfb14b875
|
|
0, 70290, 192000, 0x81682338
|