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>
26 lines
737 B
Plaintext
26 lines
737 B
Plaintext
0, 0, 921600, 0xb69faa34
|
|
0, 11520, 921600, 0x38680829
|
|
0, 23040, 921600, 0xa7263c5a
|
|
0, 34560, 921600, 0xa784626a
|
|
0, 46080, 921600, 0xb4c47212
|
|
0, 57600, 921600, 0xd17285ea
|
|
0, 69120, 921600, 0xe9b33902
|
|
0, 80640, 921600, 0x215ea693
|
|
0, 92160, 921600, 0xe2ab6c7a
|
|
0, 103680, 921600, 0xf2867624
|
|
0, 115200, 921600, 0x607d78c1
|
|
0, 126720, 921600, 0x6e743bb7
|
|
0, 138240, 921600, 0x1fbf8f5a
|
|
0, 149760, 921600, 0xac6c912e
|
|
0, 161280, 921600, 0x556933bc
|
|
0, 172800, 921600, 0xda4c242b
|
|
0, 184320, 921600, 0xa6b32f83
|
|
0, 195840, 921600, 0x1ecc2996
|
|
0, 207360, 921600, 0xf1c3fc0f
|
|
0, 218880, 921600, 0x3f1db909
|
|
0, 230400, 921600, 0x7582fb93
|
|
0, 241920, 921600, 0x102ba261
|
|
0, 253440, 921600, 0xfbcf9de0
|
|
0, 264960, 921600, 0xe9ecb4d9
|
|
0, 276480, 921600, 0x7ee36a42
|