diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-02 02:48:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-02 03:10:30 +0100 |
| commit | 4121148388f4fd02ace89eca364904d3ea8bcfe7 (patch) | |
| tree | c346f6906942b7a12c5c1f06e9d11205ea5660ab /tests/ref/fate/dfa1 | |
| parent | ef611095f0d0c1256cbb6654f94cae61a60f2736 (diff) | |
| parent | f15f02c204e5fe355e084923c34dda1c6c3a66ec (diff) | |
| download | ffmpeg-4121148388f4fd02ace89eca364904d3ea8bcfe7.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'tests/ref/fate/dfa1')
| -rw-r--r-- | tests/ref/fate/dfa1 | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/tests/ref/fate/dfa1 b/tests/ref/fate/dfa1 index 8b1bbba0e1..31a0115b86 100644 --- a/tests/ref/fate/dfa1 +++ b/tests/ref/fate/dfa1 @@ -1,25 +1,25 @@ -0, 0, 308224, 0x7264439e -0, 11520, 308224, 0xe1734f4b -0, 23040, 308224, 0x9cfe28a4 -0, 34560, 308224, 0xebb6ec8b -0, 46080, 308224, 0xaef16ca7 -0, 57600, 308224, 0x0390b439 -0, 69120, 308224, 0xe69bd008 -0, 80640, 308224, 0xa1818468 -0, 92160, 308224, 0x9d6e7d82 -0, 103680, 308224, 0x54971a9e -0, 115200, 308224, 0xe14e15a8 -0, 126720, 308224, 0xa026cf3f -0, 138240, 308224, 0xf8921be4 -0, 149760, 308224, 0xf49a42cc -0, 161280, 308224, 0xa4108f17 -0, 172800, 308224, 0xfa79cbfe -0, 184320, 308224, 0x3431f47b -0, 195840, 308224, 0x72aa3426 -0, 207360, 308224, 0x81159f85 -0, 218880, 308224, 0x04bcb289 -0, 230400, 308224, 0xb1dabbcd -0, 241920, 308224, 0x7e851c8c -0, 253440, 308224, 0x8bdea0bf -0, 264960, 308224, 0xecacdb11 -0, 276480, 308224, 0xec4c6c41 +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 |