mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-23 06:46:42 +00: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>
7 lines
169 B
Plaintext
7 lines
169 B
Plaintext
0, 0, 228150, 0xde68df49
|
|
0, 6390, 228150, 0x8e12bcaf
|
|
0, 12780, 228150, 0x851b04f7
|
|
0, 19170, 228150, 0x7e5e0950
|
|
0, 25560, 228150, 0x1d92219f
|
|
0, 31950, 228150, 0x93caa693
|